Merge pull request #69 from indigo-dc/one5-packaging

One5 packaging

install/centos/install-docker

@@ -8,8 +8,7 @@ enabled=1
 gpgcheck=1
 gpgkey=https://yum.dockerproject.org/gpg
 EOT
-yum install -y yum-versionlock docker-engine-1.9.1-1.el7.centos
-yum versionlock docker-engine
+yum install -y docker-engine
 
 systemctl start docker
 systemctl enable docker

install/ubuntu/install-docker

@@ -6,8 +6,7 @@ cat << EOT > /etc/apt/sources.list.d/docker.list
 deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -sc) main
 EOT
 apt-get -y update
-apt-get -y install linux-image-extra-$(uname -r) docker-engine=1.9.1-0~trusty
-apt-mark hold docker-engine
+apt-get -y install linux-image-extra-$(uname -r) docker-engine
 cat > /etc/init.d/dockerrestart << EOT
 #!/bin/bash
 cgroups-umount

install/ubuntu/install-onedock-one5

@@ -1,5 +1,5 @@
 #!/bin/bash
-yum install -y xmlstarlet jq git
+apt install -y xmlstarlet jq git
 cd /tmp
 git clone https://github.com/indigo-dc/onedock
 cd onedock

packaging/debian/build-dev.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 NODE=master
-VERSION=1.0-2
+VERSION=1.1
 APP=onedock
 BASE_FOLDER=.
 

packaging/debian/master/DEBIAN/control

@@ -1,9 +1,9 @@
 Package: onedock-master
-Version: 1.0-2
+Version: 1.1
 Section: unknown
 Priority: extra
 Architecture: all
-Depends: opennebula (>= 4.12.3+dfsg-3build1), xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils, docker-engine (=1.9.1-0~trusty)
+Depends: xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils, docker-engine, bridge-utils
 Maintainer: Indigo DC Project (https://github.com/indigo-dc/onedock)
 Description: ONEDock
  ONEDock is a set of extensions for OpenNebula to use containers as

packaging/debian/master/DEBIAN/postinst

@@ -1,32 +1,82 @@
 #!/bin/bash
+ONE_VER=$(dpkg -s opennebula | grep 'Version' | awk '{split($2,onev,"."); print onev[1]}')
 set -e
+
+function configure_one4 {
+cat >> /etc/one/oned.conf << EOT
+#*******************************************************************************
+# ONEDOCK configuration
+#*******************************************************************************
+
+IM_MAD = [
+    name       = "onedock",
+    executable = "one_im_ssh",
+    arguments  = "-r 3 -t 15 onedock"
+]
+
+VM_MAD = [
+    name       = "onedock",
+    executable = "one_vmm_exec",
+    arguments  = "-t 15 -r 0 onedock",
+    type       = "xml"
+]
+
+TM_MAD_CONF = [
+    name = "onedock", ln_target = "SYSTEM", clone_target = "SYSTEM", shared = "yes"
+]
+EOT
+
 sed -i.bak-onedock '/^[ \t]*TM_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{
 s/\(arguments[ ]*=[ ]*\"[^\"]*\)\(".*$\)/\1,onedock\2/};
 /^[ \t]*DATASTORE_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{
 s/\(arguments[ ]*=[ ]*\"[^\"]*\)\(".*$\)/\1,onedock\2/}' \
 /etc/one/oned.conf
+}
 
+function configure_one5 {
 cat >> /etc/one/oned.conf << EOT
+#*******************************************************************************
+# ONEDOCK configuration
+#*******************************************************************************
+
 IM_MAD = [
-      name       = "onedock",
-      executable = "one_im_ssh",
-      arguments  = "-r 3 -t 15 onedock" ]
+    NAME          = "onedock",
+    SUNSTONE_NAME = "ONEDock",
+    EXECUTABLE    = "one_im_ssh",
+    ARGUMENTS     = "-r 3 -t 15 onedock"
+]
 
 VM_MAD = [
-    name       = "onedock",
-    executable = "one_vmm_exec",
-    arguments  = "-t 15 -r 0 onedock",
-    type       = "xml" ]
+    NAME           = "onedock",
+    SUNSTONE_NAME  = "ONEDock",
+    EXECUTABLE     = "one_vmm_exec",
+    ARGUMENTS      = "-t 15 -r 0 onedock",
+    TYPE           = "xml",
+    KEEP_SNAPSHOTS = "no",
+    IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, delete, reboot, reboot-hard"
+]
 
 TM_MAD_CONF = [
-    name = "onedock", ln_target = "SYSTEM", clone_target = "SYSTEM", shared = "yes"
+    NAME = "onedock", LN_TARGET = "SELF", CLONE_TARGET = "SELF", SHARED = "YES", DS_MIGRATE = "NO"
+]
+
+DS_MAD_CONF = [
+    NAME = "onedock", REQUIRED_ATTRS = "", PERSISTENT_ONLY = "NO"
 ]
 EOT
 
-echo "Cmnd_Alias ONEDOCK = /var/tmp/one/docker-manage-network,\
-    /usr/bin/qemu-nbd, /sbin/losetup, /bin/mount" >> /etc/sudoers.d/opennebula
-sed -i.bak-onedock 's/^\(oneadmin ALL=.*\)$/\1, ONEDOCK/' /etc/sudoers.d/opennebula
+sed -i.bak '/^[ \t]*TM_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{s/\(ARGUMENTS[ ]*=[ ]*\"[^\"]*\)\(".*$\)/\1,onedock\2/};/^[ \t]*DATASTORE_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{s/\(ARGUMENTS[ ]*=[ ]*\"[^\"]*-d [^\"]*\)\( -s [^\"]*\)\(".*$\)/\1,onedock\2,onedock\3/}' /etc/one/oned.conf
+}
+
+if [ $ONE_VER -eq 5 ]; then
+    configure_one5
+else
+    configure_one4
+fi
+
 sed -i.bkp -e "s/export LOCAL_SERVER=.*/export LOCAL_SERVER=$(hostname):5000/g" /var/lib/one/remotes/onedock.conf
+sed -i.bak-onedock 's/^\(oneadmin ALL=.*\)$/\1, ONEDOCK/' /etc/sudoers.d/opennebula
+echo "Cmnd_Alias ONEDOCK = /var/tmp/one/docker-manage-network, /usr/bin/qemu-nbd, /sbin/losetup, /bin/mount" >> /etc/sudoers.d/opennebula
 usermod -aG docker oneadmin
 touch /var/log/onedock.log && chown oneadmin:oneadmin /var/log/onedock.log
 chown -R oneadmin:oneadmin /var/lib/one/remotes

packaging/debian/node/DEBIAN/control

@@ -1,9 +1,9 @@
 Package: onedock-node
-Version: 1.0-2
+Version: 1.1
 Section: unknown
 Priority: extra
 Architecture: all
-Depends: opennebula-node (>= 4.12.3+dfsg-3build1), xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils, docker-engine (=1.9.1-0~trusty)
+Depends: xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils, docker-engine, bridge-utils
 Maintainer: Indigo DC Project (https://github.com/indigo-dc/onedock)
 Description: ONEDock (for internal nodes)
  ONEDock is a set of extensions for OpenNebula to use containers as

packaging/rpm/build-rpm.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 NODE=master
-VERSION=1.0
+VERSION=1.1
 APP=onedock
 BASE_FOLDER=.
 

packaging/rpm/onedock-master.spec

@@ -1,12 +1,12 @@
 Summary: ONEDock installation - EXPERIMENTAL. Please consider installing it by hand
 Name: onedock-master
-Version: 1.0
-Release: 2
+Version: 1.1
+Release: 1
 URL:     https://github.com/indigo-dc/onedock
 License: Apache-2.0
 Group: unknown
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: xmlstarlet jq opennebula docker-engine = 1.9.1-1.el7.centos
+Requires: xmlstarlet jq opennebula docker-engine bridge-utils
 Source0: onedock-master-%{version}.tar.gz
 BuildArch: noarch
 
@@ -32,33 +32,84 @@ for f in $FILELIST; do
 done
 
 %post
+ONE_VER=$(yum info opennebula | grep 'Vers*' | awk '{split($3,onev,"."); print onev[1]}')
+set -e
+
+function configure_one4 {
+cat >> /etc/one/oned.conf << EOT
+#*******************************************************************************
+# ONEDOCK configuration
+#*******************************************************************************
+
+IM_MAD = [
+    name       = "onedock",
+    executable = "one_im_ssh",
+    arguments  = "-r 3 -t 15 onedock"
+]
+
+VM_MAD = [
+    name       = "onedock",
+    executable = "one_vmm_exec",
+    arguments  = "-t 15 -r 0 onedock",
+    type       = "xml"
+]
+
+TM_MAD_CONF = [
+    name = "onedock", ln_target = "SYSTEM", clone_target = "SYSTEM", shared = "yes"
+]
+EOT
+
 sed -i.bak-onedock '/^[ \t]*TM_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{
 s/\(arguments[ ]*=[ ]*\"[^\"]*\)\(".*$\)/\1,onedock\2/};
 /^[ \t]*DATASTORE_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{
 s/\(arguments[ ]*=[ ]*\"[^\"]*\)\(".*$\)/\1,onedock\2/}' \
 /etc/one/oned.conf
+}
 
+function configure_one5 {
 cat >> /etc/one/oned.conf << EOT
+#*******************************************************************************
+# ONEDOCK configuration
+#*******************************************************************************
+
 IM_MAD = [
-      name       = "onedock",
-      executable = "one_im_ssh",
-      arguments  = "-r 3 -t 15 onedock" ]
+    NAME          = "onedock",
+    SUNSTONE_NAME = "ONEDock",
+    EXECUTABLE    = "one_im_ssh",
+    ARGUMENTS     = "-r 3 -t 15 onedock"
+]
 
 VM_MAD = [
-    name       = "onedock",
-    executable = "one_vmm_exec",
-    arguments  = "-t 15 -r 0 onedock",
-    type       = "xml" ]
+    NAME           = "onedock",
+    SUNSTONE_NAME  = "ONEDock",
+    XECUTABLE     = "one_vmm_exec",
+    ARGUMENTS      = "-t 15 -r 0 onedock",
+    TYPE           = "xml",
+    KEEP_SNAPSHOTS = "no",
+    IMPORTED_VMS_ACTIONS = "terminate, terminate-hard, hold, release, delete, reboot, reboot-hard"
+]
 
 TM_MAD_CONF = [
-    name = "onedock", ln_target = "SYSTEM", clone_target = "SYSTEM", shared = "yes"
+    NAME = "onedock", LN_TARGET = "SELF", CLONE_TARGET = "SELF", SHARED = "YES", DS_MIGRATE = "NO"
+]
+
+DS_MAD_CONF = [
+    NAME = "onedock", REQUIRED_ATTRS = "", PERSISTENT_ONLY = "NO"
 ]
 EOT
 
-echo "Cmnd_Alias ONEDOCK = /var/tmp/one/docker-manage-network,\
-    /usr/bin/qemu-nbd, /sbin/losetup, /bin/mount" >> /etc/sudoers.d/opennebula
-sed -i.bak-onedock 's/^\(oneadmin ALL=.*\)$/\1, ONEDOCK/' /etc/sudoers.d/opennebula
+sed -i.bak '/^[ \t]*TM_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{s/\(ARGUMENTS[ ]*=[ ]*\"[^\"]*\)\(".*$\)/\1,onedock\2/};/^[ \t]*DATASTORE_MAD[ \t]*=[ \t]*\[/,/\][ \t]*$/{s/\(ARGUMENTS[ ]*=[ ]*\"[^\"]*-d [^\"]*\)\( -s [^\"]*\)\(".*$\)/\1,onedock\2,onedock\3/}' /etc/one/oned.conf
+}
+
+if [ $ONE_VER -eq 5 ]; then
+    configure_one5
+else
+    configure_one4
+fi
+
 sed -i.bkp -e "s/export LOCAL_SERVER=.*/export LOCAL_SERVER=$(hostname):5000/g" /var/lib/one/remotes/onedock.conf
+sed -i.bak-onedock 's/^\(oneadmin ALL=.*\)$/\1, ONEDOCK/' /etc/sudoers.d/opennebula
+echo "Cmnd_Alias ONEDOCK = /var/tmp/one/docker-manage-network, /usr/bin/qemu-nbd, /sbin/losetup, /bin/mount" >> /etc/sudoers.d/opennebula
 usermod -aG docker oneadmin
 touch /var/log/onedock.log && chown oneadmin:oneadmin /var/log/onedock.log
 chown -R oneadmin:oneadmin /var/lib/one/remotes

packaging/rpm/onedock-node.spec

@@ -1,12 +1,12 @@
 Summary: ONEDock installation - EXPERIMENTAL. Please consider installing it by hand
 Name: onedock-node
-Version: 1.0
-Release: 2
+Version: 1.1
+Release: 1
 URL:     https://github.com/indigo-dc/onedock
 License: Apache-2.0
 Group: unknown
 BuildRoot: %{_tmppath}/%{name}-root
-Requires: xmlstarlet jq opennebula-node-kvm docker-engine = 1.9.1-1.el7.centos
+Requires: xmlstarlet jq opennebula-node-kvm docker-engine bridge-utils 
 BuildArch: noarch
 
 %description