Skip to content

Commit 594bb9b

Browse files
Pradeepchipchilders
authored andcommitted
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]>
1 parent 7a79451 commit 594bb9b

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

packaging/centos63/cloud.spec

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ Requires: mkisofs
7878
Requires: MySQL-python
7979
Requires: python-paramiko
8080
Requires: ipmitool
81-
Requires: %{name}-common = %{_ver}
81+
Requires: %{name}-common = %{_ver}
82+
Requires: %{name}-awsapi = %{_ver}
8283
Obsoletes: cloud-client < 4.1.0
8384
Obsoletes: cloud-client-ui < 4.1.0
8485
Obsoletes: cloud-daemonize < 4.1.0
@@ -318,6 +319,10 @@ if [ "$1" == "1" ] ; then
318319
/sbin/chkconfig --level 345 cloud-management on > /dev/null 2>&1 || true
319320
fi
320321

322+
if [ -d "%{_datadir}/%{name}-management" ] ; then
323+
ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
324+
fi
325+
321326
if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then
322327
echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in
323328
echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/
@@ -330,10 +335,10 @@ if getent passwd cloud | grep -q /var/lib/cloud; then
330335
fi
331336

332337

333-
%post awsapi
334-
if [ -d "%{_datadir}/%{name}-management" ] ; then
335-
ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
336-
fi
338+
#%post awsapi
339+
#if [ -d "%{_datadir}/%{name}-management" ] ; then
340+
# ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
341+
#fi
337342

338343
#No default permission as the permission setup is complex
339344
%files management

0 commit comments

Comments
 (0)