You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/08/24 07:34:42 UTC
[1/3] git commit: updated refs/heads/4.9 to d6e9045
Repository: cloudstack
Updated Branches:
refs/heads/4.9 4c59a6b17 -> d6e904520
CLOUDSTACK-9467: Add symlink to key file for usage server
On fresh installation, the usage server fails to start if the `key` file does
not exist in its classpath. The issue is reproducible in environments where
the usage server is installed before cloudstack-setup-databases has been called.
Before the cloudstack db has been setup, the key file does not exist at its
default location and installation of usage-server fails to add a symlink to the
key file.
This fix adds a default symlink to `/etc/cloudstack/management/key` if a
symlink/file does not already exist in the /etc/cloudstack/usage directory.
On new installation, in the post-installation steps it checks if the symlink
or file exists, and adds a symlink if it does not exist. On existing
installations, if symlink or file exists then it will skip adding symlink.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8cd44b16
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8cd44b16
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8cd44b16
Branch: refs/heads/4.9
Commit: 8cd44b1684b41884f10f350318dc8130eb5b5f75
Parents: 740bd45
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Aug 23 17:20:41 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Aug 23 17:20:41 2016 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 4 ++++
packaging/centos7/cloud.spec | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cd44b16/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 6458c3d..fd02157 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -552,6 +552,10 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
fi
+if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
+ ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
+fi
+
%post marvin
pip install --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cd44b16/packaging/centos7/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index bee22e9..3917a05 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -449,6 +449,10 @@ if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
fi
+if [ ! -f "%{_sysconfdir}/%{name}/usage/key" ]; then
+ ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
+fi
+
%post marvin
pip install --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
[2/3] git commit: updated refs/heads/4.9 to d6e9045
Posted by bh...@apache.org.
Merge pull request #1657 from shapeblue/4.8-usageserverfix
[lts/blocker] CLOUDSTACK-9467: Add symlink to key file for usage serverOn fresh installation, the usage server fails to start if the `key` file does
not exist in its classpath. The issue is reproducible in environments (such as Trillian)
where the usage server is installed before cloudstack-setup-databases has been called.
Before the cloudstack db has been setup, the key file does not exist at its
default location and installation of usage-server fails to add a symlink to the
key file.
This fix adds a default symlink to `/etc/cloudstack/management/key` if a
symlink/file does not already exist in the /etc/cloudstack/usage directory.
On new installation, in the post-installation steps it checks if the symlink
or file exists, and adds a symlink if it does not exist. On existing
installations, if symlink or file exists then it will skip adding symlink.
/cc @jburwell @PaulAngus @karuturi
@blueorangutan package
* pr/1657:
CLOUDSTACK-9467: Add symlink to key file for usage server
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/19f159a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/19f159a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/19f159a9
Branch: refs/heads/4.9
Commit: 19f159a96b0a565f1a70cdd745a6f2ca0c35207c
Parents: 3fa8762 8cd44b1
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Aug 24 13:04:02 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Aug 24 13:04:02 2016 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 4 ++++
packaging/centos7/cloud.spec | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
[3/3] git commit: updated refs/heads/4.9 to d6e9045
Posted by bh...@apache.org.
Merge branch '4.8' into 4.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d6e90452
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d6e90452
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d6e90452
Branch: refs/heads/4.9
Commit: d6e904520b1f89c63e278379ca2bebe9996c27d3
Parents: 4c59a6b 19f159a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Aug 24 13:04:25 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Aug 24 13:04:25 2016 +0530
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 4 ++++
packaging/centos7/cloud.spec | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6e90452/packaging/centos63/cloud.spec
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d6e90452/packaging/centos7/cloud.spec
----------------------------------------------------------------------