Merge pull request #5 from subutai-io/dev

Dev-master
subutai-io · Oct 23, 2018 · af5b652 · af5b652
2 parents 97a86ee + b9924ae
commit af5b652
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -14,24 +14,7 @@ try {
 
 		String date = new Date().format( 'yyyyMMddHHMMSS' )
 		def CWD = pwd()
-
-                switch (env.BRANCH_NAME) {
-                    case ~/master/: 
-                        cdnHost = "mastercdn.subutai.io"; 
-                        break;
-                    case ~/dev/: 
-                        cdnHost = "devcdn.subutai.io"; 
-                        break;
-                    case ~/no-snap/: 
-                        cdnHost = "devcdn.subutai.io"; 
-                        break;
-                    case ~/sysnet/: 
-                        cdnHost = "sysnetcdn.subutai.io"; 
-                        break;
-                    default: 
-                        cdnHost = "cdn.subutai.io"; 
-                }
-                def release = env.BRANCH_NAME
+    def release = env.BRANCH_NAME
 
 		sh """
 			#set +x

diff --git a/debian/postinst b/debian/postinst
@@ -1,6 +1,8 @@
 #!/bin/sh
 # POSTINST script for subutai-ovs
 
+systemctl disable lxc-net.service
+systemctl stop lxc-net.service
 systemctl disable dnsmasq.service
 systemctl stop dnsmasq.service
 systemctl enable subutai-dnsmasq.service