etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4370 - Upgrade failing due to depenency with cloudstack-agent, changed remove dependency from cloud-agent to cloud-common

This commit is contained in:
rayeesn 2013-08-19 07:25:39 -07:00 committed by frank
parent 6f7fdac3ee
commit 12f36b8dbb
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packaging/centos63/cloud.spec
View File

@ -104,6 +104,7 @@ Obsoletes: cloud-deps < 4.1.0
Obsoletes: cloud-python < 4.1.0
Obsoletes: cloud-setup < 4.1.0
Obsoletes: cloud-cli < 4.1.0
Obsoletes: cloud-daemonize < 4.1.0
Group: System Environment/Libraries
%description common
The Apache CloudStack files shared between agent and management server
@ -128,7 +129,6 @@ Provides: cloud-agent
Obsoletes: cloud-agent < 4.1.0
Obsoletes: cloud-agent-libs < 4.1.0
Obsoletes: cloud-test < 4.1.0
Obsoletes: cloud-daemonize < 4.1.0
Group: System Environment/Libraries
%description agent
The CloudStack agent for KVM hypervisors
@ -414,13 +414,11 @@ if [ -f $oldserverxml ] || [ -L $oldserverxml ]; then
if stat -c %N $oldserverxml| grep -q server-ssl ; then
if [ -f $serverxml ] || [ -L $serverxml ]; then rm -f $serverxml; fi
ln -s %{_sysconfdir}/%{name}/management/server-ssl.xml $serverxml
echo Please verify the server.xml in saved folder, and make the required changes manually , saved folder available at
echo %{_sysconfdir}/%{name}/management
echo Please verify the server.xml in saved folder, and make the required changes manually , saved folder available at $oldserverxml
else
if [ -f $serverxml ] || [ -L $serverxml ]; then rm -f $serverxml; fi
ln -s %{_sysconfdir}/%{name}/management/server-nonssl.xml $serverxml
echo Please verify the server.xml in saved folder, and make the required changes manually , saved folder available at
echo %{_sysconfdir}/%{name}/management
echo Please verify the server.xml in saved folder, and make the required changes manually , saved folder available at $oldserverxml
fi
else
@ -434,13 +432,11 @@ if [ -f $oldtomcatconf ] || [ -L $oldtomcatconf ] ; then
if stat -c %N $oldtomcatconf| grep -q tomcat6-ssl ; then
if [ -f $tomcatconf ] || [ -L $tomcatconf ]; then rm -f $tomcatconf; fi
ln -s %{_sysconfdir}/%{name}/management/tomcat6-ssl.conf $tomcatconf
echo Please verify the tomcat6.conf in saved folder, and make the required changes manually , saved folder available at
echo %{_sysconfdir}/%{name}/management
echo Please verify the tomcat6.conf in saved folder, and make the required changes manually , saved folder available at $oldtomcatconf
else
if [ -f $tomcatconf ] || [ -L $tomcatconf ]; then rm -f $tomcatconf; fi
ln -s %{_sysconfdir}/%{name}/management/tomcat6-nonssl.conf $tomcatconf
echo Please verify the tomcat6.conf in saved folder, and make the required changes manually , saved folder available at
echo %{_sysconfdir}/%{name}/management
echo Please verify the tomcat6.conf in saved folder, and make the required changes manually , saved folder available at $oldtomcatconf
fi
else
echo "Unable to determine ssl settings for tomcat.conf, please run cloudstack-setup-management manually"