cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject git commit: refs/heads/master - Adding awsapi in the require section of cloud.spec as it resolves issue with EC2 QUERY API Feature.
Date Tue, 12 Mar 2013 13:29:19 GMT
Updated Branches:
  refs/heads/master 7a794519a -> 594bb9b5a


Adding awsapi in the require section of cloud.spec as it resolves issue with EC2 QUERY API
Feature.

Moved the post awsapi section to the post management since it is trying to provide symb link
before installing management server.

Signed-off-by: Pradeep <pradeep.soundararajan@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/594bb9b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/594bb9b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/594bb9b5

Branch: refs/heads/master
Commit: 594bb9b5a3391cb41a1122b15abc2ad590b920e4
Parents: 7a79451
Author: Pradeep <pradeep.soundararajan@citrix.com>
Authored: Tue Mar 12 11:28:51 2013 +0530
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Tue Mar 12 09:29:04 2013 -0400

----------------------------------------------------------------------
 packaging/centos63/cloud.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/594bb9b5/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 2fc744d..8f71f03 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -78,7 +78,8 @@ Requires: mkisofs
 Requires: MySQL-python
 Requires: python-paramiko
 Requires: ipmitool
-Requires: %{name}-common = %{_ver} 
+Requires: %{name}-common = %{_ver}
+Requires: %{name}-awsapi = %{_ver} 
 Obsoletes: cloud-client < 4.1.0
 Obsoletes: cloud-client-ui < 4.1.0
 Obsoletes: cloud-daemonize < 4.1.0
@@ -318,6 +319,10 @@ if [ "$1" == "1" ] ; then
     /sbin/chkconfig --level 345 cloud-management on > /dev/null 2>&1 || true
 fi
 
+if [ -d "%{_datadir}/%{name}-management" ] ; then
+   ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
+fi
+
 if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
     echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util
and put it in 
     echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
@@ -330,10 +335,10 @@ if getent passwd cloud | grep -q /var/lib/cloud; then
 fi
 
 
-%post awsapi
-if [ -d "%{_datadir}/%{name}-management" ] ; then
-   ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
-fi
+#%post awsapi
+#if [ -d "%{_datadir}/%{name}-management" ] ; then
+#   ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
+#fi
 
 #No default permission as the permission setup is complex
 %files management


Mime
View raw message