You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/04/19 07:30:06 UTC
[cloudstack] branch master updated (d96b3cd -> fb1afb1)
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from d96b3cd Merge release branch 4.9 to master
new 248cecd CLOUDSTACK-9858: remove midonet plugin dependency on client packaging
new 579c721 cloudutils: Fix regression from PR#2033
new fb1afb1 Merge pull request #2051 from shapeblue/master-fix-midonet-changes
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
client/pom.xml | 20 ++++++++++----
python/lib/cloudutils/serviceConfigServer.py | 40 +++++++++++++++++-----------
2 files changed, 39 insertions(+), 21 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].
[cloudstack] 03/03: Merge pull request #2051 from
shapeblue/master-fix-midonet-changes
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit fb1afb1a70b4da71510371886fbdd47fee943edf
Merge: d96b3cd 579c721
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Apr 19 12:57:53 2017 +0530
Merge pull request #2051 from shapeblue/master-fix-midonet-changes
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
client/pom.xml | 20 ++++++++++----
python/lib/cloudutils/serviceConfigServer.py | 40 +++++++++++++++++-----------
2 files changed, 39 insertions(+), 21 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.
[cloudstack] 01/03: CLOUDSTACK-9858: remove midonet plugin
dependency on client packaging
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 248cecd2be3ba63a8024292018638b5613211b50
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Apr 18 19:48:24 2017 +0530
CLOUDSTACK-9858: remove midonet plugin dependency on client packaging
This fixes packaging/build regression from #2036
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
client/pom.xml | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/client/pom.xml b/client/pom.xml
index 89d647c..381cfcb 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -150,11 +150,6 @@
</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>
<version>${project.version}</version>
</dependency>
@@ -1008,6 +1003,21 @@
</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>
<property>
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.
[cloudstack] 02/03: cloudutils: Fix regression from PR#2033
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 579c7213a76483d26fafaa7e5b6b4bb0bb5d222e
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Apr 19 12:51:40 2017 +0530
cloudutils: Fix regression from PR#2033
This fixes regression from PR #2033 which breaks cloudstack deployment
for centos6/7.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
python/lib/cloudutils/serviceConfigServer.py | 40 +++++++++++++++++-----------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/python/lib/cloudutils/serviceConfigServer.py b/python/lib/cloudutils/serviceConfigServer.py
index e2c643d..c975f6e 100644
--- a/python/lib/cloudutils/serviceConfigServer.py
+++ b/python/lib/cloudutils/serviceConfigServer.py
@@ -89,10 +89,12 @@ class cloudManagementConfig(serviceCfgBase):
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 @@ class cloudManagementConfig(serviceCfgBase):
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 @@ class cloudManagementConfig(serviceCfgBase):
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 @@ class cloudManagementConfig(serviceCfgBase):
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
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.