Cestc

.gitignore

@@ -9,3 +9,4 @@ webvirtmgr/local/.secret_key_store
 webvirtmgr/local/local_settings.py
 dist
 webvirtmgr.egg-info
+migrations/*.py

.travis.yml

@@ -1,10 +1,11 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
 env:
   - DJANGO=1.5.5
 install:
-  - pip install -r dev-requirements.txt
+  - pip install -r dev-requirements.txt --use-mirrors
 script:
   - pep8 --exclude=IPy.py --ignore=E501 console hostdetail instance networks servers storages vrtManager
   - pyflakes console hostdetail instance networks servers storages vrtManager

OPERATIONS

@@ -0,0 +1,52 @@
+创建docker镜像
+git clone https://github.com/jxph025319/webvirtmgr.git
+cd webvirtmgr/build
+或者
+cp webvirtmgr/build_dev ~
+注意更新目录文件
+mv webvirtmgr ~/build_dev
+
+docker build --no-cache -t whharbor.centos.org/centos/webvirtmgr:v1 .
+
+webvirtmgr容器部署
+groupadd -g 1010 libvirtd
+useradd -u 1010 -g libvirtd -s /sbin/nologin -d /data/vm webvirtmgr
+chown -R webvirtmgr:libvirtd /data/vm
+# 默認賬號密碼為root/Cestc_01
+
+开发部署命令
+docker run -d --name webvirtmgr_dev -h webvirtmgr_dev -v /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime  --privileged=true -v /data/vm1:/data/vm -p 2100:22 -p 8080:8080 -p 6080:6080 -m 4g whharbor.cestc.cn/centos/webvirtmgr:v5.0.5 /usr/sbin/init
+生产部署命令
+docker run -d --name webvirtmgr -h webvirtmgr -v /usr/share/zoneinfo/Asia/Shanghai:/etc/localtime  --privileged=true -v /data/vm:/data/vm -p 8080:8080 -p 6080:6080 -m 4g whharbor.cestc.cn/centos/webvirtmgr:v6.0.0
+
+
+docker实例内信任部署：
+chown -R webvirtmgr:libvirtd /data/vm
+su - webvirtmgr -s /bin/bash
+ssh-keygen -t rsa -P '' -f ~/.ssh/id_rsa
+touch ~/.ssh/config && echo -e "StrictHostKeyChecking=no\nUserKnownHostsFile=/dev/null" >> ~/.ssh/config
+chmod 0600 ~/.ssh/config
+
+删除数据库文件和用户
+rm -rf /data/vm
+userdel webvirtmgr
+
+針對客戶物理機的操作
+su - webvirtmgr -s /bin/bash
+ssh-copy-id [email protected]
+
+宿主机创建信任
+docker exec -it webvirtmgr_dev su - webvirtmgr -c "ssh-keygen -t rsa"
+docker exec -it webvirtmgr_dev su - webvirtmgr -c "sshpass -p yHTq58js\&s9C\!ceV ssh-copy-id -o StrictHostKeyChecking=no [email protected]"
+
+初始化admin 账号密码
+echo "from rbac.models import UserInfo as User ; User.objects.create_superuser('admin', 'admin@localhost', 'Cestc_01')" | /usr/bin/python /opt/webvirtmgr/manage.py shell
+
+国际化
+python manage.py makemessages -l zh_Hans
+vim /opt/webvirtmgr/locale/zh_Hans/LC_MESSAGES/django.po
+python manage.py compilemessages --locale /opt/webvirtmgr/locale/zh_Hans
+
+备份和还原数据库
+python manage.py dumpdata rbac > init.json
+python manage.py loaddata init.json

README.rst

@@ -1,56 +1,11 @@
 =========================
-WebVirtMgr panel - v4.8.9
+WebVirtMgr panel - v6.0.0
 =========================
--------
-New project like WebVirtMgr with User Management and Filesystem management - `WebVirtCloud <https://github.com/retspen/webvirtcloud>`_
--------
 
 -------
-Warning
+更新信息
 -------
 
-In latest version app `console/webvirtmgr-novnc` move to `console/webvirtmgr-console` you need check your supervisor settings.
-
-----------
-Whats new?
-----------
-
-- Added RPM specs (Thanks: `Edoardo Spadoni <https://github.com/edospadoni>`_)
-- Added support SPICE, SSH Tunnel, fixed some bugs (Thanks: `brenard <https://github.com/brenard>`_)
-- Responsive design (Thanks: `Michel Käser <https://github.com/MaddinXx>`_)
-- Added VNC WebSocket support (Thanks: `Tolbkni Kao <https://github.com/tolbkni>`_)
-- Added novnc proxy supporting new websockify versions (Thanks: `casell <https://github.com/casell>`_)
-- Added support `TLS <http://libvirt.org/remote.html#Remote_certificates>`_ connection (Thanks: `junkb <https://github.com/junkb>`_)
-- `Puppet module to control libvirt/kvm <https://github.com/ITBlogger/puppet-kvm>`_ (Thanks: `Alex Scoble <https://github.com/ITBlogger>`_)
-- `Deployment via Fabric/Fabtools <https://github.com/retspen/webvirtmgr/tree/master/deploy/fabric>`_ (Thanks: `Mohab Usama <https://github.com/mohabusama>`_)
-
-Screenshots
------------
-`Show <https://github.com/retspen/webvirtmgr/wiki/Screenshots>`_
-
-
-Introduction
-------------
-
-WebVirtMgr is a libvirt-based Web interface for managing virtual machines. It allows you to create and configure new domains, and adjust a domain's resource allocation. A VNC viewer presents a full graphical console to the guest domain. KVM is currently the only hypervisor supported.
-
-Technology:
-***********
-
-The application logic is written in Python & Django. The LIBVIRT Python bindings are used to interacting with the underlying hypervisor.
-
-Installation (Only web panel)
------------------------------
-
-`Install WebVirtMgr <https://github.com/retspen/webvirtmgr/wiki/Install-WebVirtMgr>`_
-
-
-Setup host server (Server for VM's)
------------------------------------
-
-`Setup Host Server <https://github.com/retspen/webvirtmgr/wiki/Setup-Host-Server>`_
-
-License
-*******
-
-WebVirtMgr is licensed under the `Apache Licence, Version 2.0 <http://www.apache.org/licenses/LICENSE-2.0.html>`_.
+1、对页面、菜单和按钮新增权限，默认对使用者分成2组，管理员和viewer。
+2、新增对虚拟机添加和删除磁盘功能，其中删除必须在虚拟机关闭后才可以。
+3、调整国际化

bootstrap.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ ! -f "/data/vm/webvirtmgr.sqlite3" ]; then
+  #chown webvirtmgr /var/run/libvirt/libvirt-sock
+  #/usr/bin/python /opt/webvirtmgr/manage.py syncdb --noinput
+  /usr/bin/python /opt/webvirtmgr/manage.py makemigrations && /usr/bin/python /opt/webvirtmgr/manage.py migrate
+  echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'admin@localhost', 'Cestc_01')" | /usr/bin/python /opt/webvirtmgr/manage.py shell
+  /usr/bin/python /opt/webvirtmgr/manage.py loaddata /opt/webvirtmgr/init.json
+  chown -R webvirtmgr:libvirtd /data/vm
+fi
+

build/Dockerfile

@@ -0,0 +1,28 @@
+FROM centos:centos7.4.1708
+MAINTAINER Jiajun Chen<[email protected]>
+
+RUN yum -y install epel-release vim openssh-clients openssh-server net-tools sshpass && \
+    yum -y install python2-pip python-devel libvirt-python libxml2-python git novnc python-websockify numpy supervisor gettext && \
+    yum clean all && rm -rf /var/cache/yum
+RUN echo cestc01 | passwd --stdin root
+RUN git clone -b cestc https://github.com/jxph025319/webvirtmgr.git /opt/webvirtmgr
+WORKDIR /opt/webvirtmgr
+RUN git checkout v6.0.0
+RUN pip install -r requirements.txt
+#ADD local_settings.py /opt/webvirtmgr/webvirtmgr/local/local_settings.py
+#RUN sed -i 's/0.0.0.0/172.17.42.1/g' vrtManager/create.py
+RUN /usr/bin/python /opt/webvirtmgr/manage.py collectstatic --noinput
+RUN cp build/webvirtmgr.ini /etc/supervisord.d/webvirtmgr.ini &&  mkdir -p /data/vm/ && \
+cp /opt/webvirtmgr/build/local_settings.py /opt/webvirtmgr/webvirtmgr/local/local_settings.py
+#ADD gunicorn.conf.py /opt/webvirtmgr/conf/gunicorn.conf.py
+#ADD bootstrap.sh /opt/webvirtmgr/bootstrap.sh
+
+#RUN groupadd -g 1010 libvirtd && useradd webvirtmgr -g libvirtd -u 1010 -d /data/vm/ -s /sbin/nologin
+RUN groupadd -g 1010 libvirtd && useradd webvirtmgr -g libvirtd -u 1010 -d /data/vm/ && chown webvirtmgr:libvirtd -R /opt/webvirtmgr && echo cestc01 | passwd --stdin webvirtmgr
+
+WORKDIR /opt/webvirtmgr
+VOLUME /data/vm
+
+EXPOSE 8080
+EXPOSE 6080
+CMD ["supervisord", "-n"]

build/local_settings.py

@@ -0,0 +1,10 @@
+import os
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': '/data/vm/webvirtmgr.sqlite3',
+    }
+}
+
+

build/webvirtmgr.ini

@@ -0,0 +1,17 @@
+[program:webvirtmgr]
+command=/bin/sh -c "bash /opt/webvirtmgr/bootstrap.sh 2>&1 > boot.log && /usr/bin/gunicorn -c /opt/webvirtmgr/conf/gunicorn.conf.py webvirtmgr.wsgi"
+directory=/opt/webvirtmgr
+autostart=true
+autorestart=true
+stdout_logfile=/tmp/sup_webvirtmgr.log
+stderr_logfile=/tmp/sup_webvirtmgr_err.log
+user=webvirtmgr
+
+[program:webvirtmgr-console]
+command=/usr/bin/python /opt/webvirtmgr/console/webvirtmgr-console
+directory=/opt/webvirtmgr
+autostart=true
+autorestart=true
+stdout_logfile=/tmp/sup_webvirtmgr-console.log
+stderr_logfile=/tmp/sup_webvirtmgr-console_err.log
+user=webvirtmgr

build_dev/Dockerfile

@@ -0,0 +1,29 @@
+FROM whharbor.centos.org/centos/bash:v1
+MAINTAINER Jiajun Chen<[email protected]>
+
+RUN yum -y install epel-release vim sshpass && \
+    yum -y install python2-pip python-devel libvirt-python libxml2-python git novnc python-websockify numpy supervisor gettext && \
+    yum clean all && rm -rf /var/cache/yum
+
+#RUN git clone -b cestc https://github.com/jxph025319/webvirtmgr.git /opt/webvirtmgr
+COPY webvirtmgr /opt/webvirtmgr
+WORKDIR /opt/webvirtmgr
+#RUN git checkout v5.0.2
+RUN pip install -r requirements.txt
+#ADD local_settings.py /opt/webvirtmgr/webvirtmgr/local/local_settings.py
+#RUN sed -i 's/0.0.0.0/172.17.42.1/g' vrtManager/create.py
+RUN /usr/bin/python /opt/webvirtmgr/manage.py collectstatic --noinput
+RUN cp build/webvirtmgr.ini /etc/supervisord.d/webvirtmgr.ini &&  mkdir -p /data/vm/.ssh && \
+cp /opt/webvirtmgr/build/local_settings.py /opt/webvirtmgr/webvirtmgr/local/local_settings.py
+#ADD gunicorn.conf.py /opt/webvirtmgr/conf/gunicorn.conf.py
+#ADD bootstrap.sh /opt/webvirtmgr/bootstrap.sh
+
+#RUN groupadd -g 1010 libvirtd && useradd webvirtmgr -g libvirtd -u 1010 -d /data/vm/ -s /sbin/nologin
+RUN groupadd -g 1010 libvirtd && useradd webvirtmgr -g libvirtd -u 1010 -d /data/vm/ && chown webvirtmgr:libvirtd -R /opt/webvirtmgr
+
+WORKDIR /opt/webvirtmgr
+VOLUME /data/vm
+
+EXPOSE 8080
+EXPOSE 6080
+CMD ["supervisord", "-n"]

build_dev/local_settings.py

@@ -0,0 +1,10 @@
+import os
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': '/data/vm/webvirtmgr.sqlite3',
+    }
+}
+
+

build_dev/webvirtmgr.ini

@@ -0,0 +1,17 @@
+[program:webvirtmgr]
+command=/bin/sh -c "bash /opt/webvirtmgr/bootstrap.sh 2>&1 > boot.log && /usr/bin/gunicorn -c /opt/webvirtmgr/conf/gunicorn.conf.py webvirtmgr.wsgi"
+directory=/opt/webvirtmgr
+autostart=true
+autorestart=true
+stdout_logfile=/tmp/sup_webvirtmgr.log
+stderr_logfile=/tmp/sup_webvirtmgr_err.log
+user=webvirtmgr
+
+[program:webvirtmgr-console]
+command=/usr/bin/python /opt/webvirtmgr/console/webvirtmgr-console
+directory=/opt/webvirtmgr
+autostart=true
+autorestart=true
+stdout_logfile=/tmp/sup_webvirtmgr-console.log
+stderr_logfile=/tmp/sup_webvirtmgr-console_err.log
+user=webvirtmgr