Updated Branches: refs/heads/4.1 b65868d3a -> 4f071bcdf
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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4f071bcd Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4f071bcd Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4f071bcd Branch: refs/heads/4.1 Commit: 4f071bcdf8279b3edcf7ab43df697ba2a0d6dcdf Parents: b65868d Author: Pradeep <[email protected]> Authored: Tue Mar 12 11:28:51 2013 +0530 Committer: Chip Childers <[email protected]> Committed: Tue Mar 12 09:25:24 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/4f071bcd/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 63c59e2..ccd2bc4 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 @@ -316,6 +317,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/ @@ -328,10 +333,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
