From 594bb9b5a3391cb41a1122b15abc2ad590b920e4 Mon Sep 17 00:00:00 2001 From: Pradeep Date: Tue, 12 Mar 2013 11:28:51 +0530 Subject: [PATCH] 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 --- packaging/centos63/cloud.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 2fc744dbaff..8f71f03b811 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