git commit: updated refs/heads/master to 51e0488

[ki...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/master 23c7c7398 -> 51e0488e5


CLOUDSTACK-7316: Usage Server is not getting started when we install it on management server. This is happening when encryption is enabled. For usage server it is not able to get key file in the classpath.


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

Branch: refs/heads/master
Commit: 51e0488e5c07595219142fb2f954726f72e0adf2
Parents: 23c7c73
Author: Damodar <da...@citrix.com>
Authored: Mon Sep 1 17:57:41 2014 +0530
Committer: Kishan Kavala <ki...@apache.org>
Committed: Tue Sep 2 15:13:45 2014 +0530

----------------------------------------------------------------------
 packaging/centos63/cloud.spec | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51e0488e/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 790f57b..7306d1f 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -556,6 +556,12 @@ if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
     /sbin/chkconfig --level 345 cloudstack-usage on > /dev/null 2>&1 || true
 fi
 
+if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
+    echo Replacing key with management server key
+    rm -f %{_sysconfdir}/%{name}/usage/key
+    ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
+fi
+
 #%post awsapi
 #if [ -d "%{_datadir}/%{name}-management" ] ; then
 #   ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080