Merge pull request #2051 from shapeblue/master-fix-midonet-changes

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

client/pom.xml

@@ -148,11 +148,6 @@
       <artifactId>cloud-plugin-network-bigswitch</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.cloudstack</groupId>
-      <artifactId>cloud-plugin-network-midonet</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-plugin-network-ssp</artifactId>
@@ -1007,6 +1002,21 @@
         </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>midonet</id>
+      <activation>
+        <property>
+          <name>midonet</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.cloudstack</groupId>
+          <artifactId>cloud-plugin-network-midonet</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
     <profile>
       <id>srx</id>
       <activation>

python/lib/cloudutils/serviceConfigServer.py

@@ -89,10 +89,12 @@ def checkHostName():
                 if os.path.exists("/etc/cloudstack/management/server.xml"):
                     bash("rm -f /etc/cloudstack/management/server.xml")
                 bash("ln -s /etc/cloudstack/management/server7-ssl.xml /etc/cloudstack/management/server.xml")
-                bash("rm -f /usr/share/cloudstack-management/bin")
-                bash("rm -f /usr/share/cloudstack-management/lib")
-                bash("ln -s /usr/share/tomcat7/bin /usr/share/cloudstack-management/bin")
-                bash("ln -s /usr/share/tomcat7/lib /usr/share/cloudstack-management/lib")
+                if os.path.exists("/usr/share/tomcat7/bin"):
+                    bash("rm -f /usr/share/cloudstack-management/bin")
+                    bash("ln -s /usr/share/tomcat7/bin /usr/share/cloudstack-management/bin")
+                if os.path.exists("/usr/share/tomcat7/lib"):
+                    bash("rm -f /usr/share/cloudstack-management/lib")
+                    bash("ln -s /usr/share/tomcat7/lib /usr/share/cloudstack-management/lib")
             else:
                 if not os.path.exists("/etc/cloudstack/management/server-ssl.xml") or not os.path.exists("/etc/cloudstack/management/tomcat6-ssl.conf"):
                     raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server-ssl.xml or /etc/cloudstack/management/tomcat6-ssl.conf, https enable failed")
@@ -102,10 +104,12 @@ def checkHostName():
                     bash("rm -f /etc/cloudstack/management/tomcat6.conf")
                 bash("ln -s /etc/cloudstack/management/server-ssl.xml /etc/cloudstack/management/server.xml")
                 bash("ln -s /etc/cloudstack/management/tomcat6-ssl.conf /etc/cloudstack/management/tomcat6.conf")
-                bash("rm -f /usr/share/cloudstack-management/bin")
-                bash("rm -f /usr/share/cloudstack-management/lib")
-                bash("ln -s /usr/share/tomcat6/bin /usr/share/cloudstack-management/bin")
-                bash("ln -s /usr/share/tomcat6/lib /usr/share/cloudstack-management/lib")
+                if os.path.exists("/usr/share/tomcat6/bin"):
+                    bash("rm -f /usr/share/cloudstack-management/bin")
+                    bash("ln -s /usr/share/tomcat6/bin /usr/share/cloudstack-management/bin")
+                if os.path.exists("/usr/share/tomcat6/lib"):
+                    bash("rm -f /usr/share/cloudstack-management/lib")
+                    bash("ln -s /usr/share/tomcat6/lib /usr/share/cloudstack-management/lib")
             if not bash("iptables-save |grep PREROUTING | grep 6443").isSuccess():
                 bash("iptables -A PREROUTING -t nat -p tcp --dport 443 -j REDIRECT --to-port 6443")
         else:
@@ -115,10 +119,12 @@ def checkHostName():
                 if os.path.exists("/etc/cloudstack/management/server.xml"):
                     bash("rm -f /etc/cloudstack/management/server.xml")
                 bash("ln -s /etc/cloudstack/management/server7-nonssl.xml /etc/cloudstack/management/server.xml")
-                bash("rm -f /usr/share/cloudstack-management/bin")
-                bash("rm -f /usr/share/cloudstack-management/lib")
-                bash("ln -s /usr/share/tomcat7/bin /usr/share/cloudstack-management/bin")
-                bash("ln -s /usr/share/tomcat7/lib /usr/share/cloudstack-management/lib")
+                if os.path.exists("/usr/share/tomcat7/bin"):
+                    bash("rm -f /usr/share/cloudstack-management/bin")
+                    bash("ln -s /usr/share/tomcat7/bin /usr/share/cloudstack-management/bin")
+                if os.path.exists("/usr/share/tomcat7/lib"):
+                    bash("rm -f /usr/share/cloudstack-management/lib")
+                    bash("ln -s /usr/share/tomcat7/lib /usr/share/cloudstack-management/lib")
             else:
                 if not os.path.exists("/etc/cloudstack/management/server-nonssl.xml") or not os.path.exists("/etc/cloudstack/management/tomcat6-nonssl.conf"):
                     raise CloudRuntimeException("Cannot find /etc/cloudstack/management/server-nonssl.xml or /etc/cloudstack/management/tomcat6-nonssl.conf, https enable failed")
@@ -128,10 +134,12 @@ def checkHostName():
                     bash("rm -f /etc/cloudstack/management/tomcat6.conf")
                 bash("ln -s /etc/cloudstack/management/server-nonssl.xml /etc/cloudstack/management/server.xml")
                 bash("ln -s /etc/cloudstack/management/tomcat6-nonssl.conf /etc/cloudstack/management/tomcat6.conf")
-                bash("rm -f /usr/share/cloudstack-management/bin")
-                bash("rm -f /usr/share/cloudstack-management/lib")
-                bash("ln -s /usr/share/tomcat6/bin /usr/share/cloudstack-management/bin")
-                bash("ln -s /usr/share/tomcat6/lib /usr/share/cloudstack-management/lib")
+                if os.path.exists("/usr/share/tomcat6/bin"):
+                    bash("rm -f /usr/share/cloudstack-management/bin")
+                    bash("ln -s /usr/share/tomcat6/bin /usr/share/cloudstack-management/bin")
+                if os.path.exists("/usr/share/tomcat6/lib"):
+                    bash("rm -f /usr/share/cloudstack-management/lib")
+                    bash("ln -s /usr/share/tomcat6/lib /usr/share/cloudstack-management/lib")
         bash("touch /var/run/cloudstack-management.pid")
         bash("chown cloud.cloud /var/run/cloudstack-management.pid")
         #distro like sl 6.1 needs this folder, or tomcat6 failed to start