From 0e08dff8bde4d9962775f3d9e1620dd04b485556 Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Fri, 21 Aug 2020 10:19:04 +0200 Subject: [PATCH 1/3] Update cloud.spec --- packaging/centos7/cloud.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index e6eb4e3ab981..aa90a435a343 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -465,14 +465,14 @@ fi %post usage if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then - echo Replacing db.properties with management server db.properties + echo Replacing usage server's db.properties with a link to the management server's db.properties rm -f %{_sysconfdir}/%{name}/usage/db.properties ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true fi if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then - echo Replacing key with management server key + echo Replacing usage server's key with a link to the management server's key rm -f %{_sysconfdir}/%{name}/usage/key ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi From 62214e0b9b909d6284fb3e30f142cd061ce4bc3e Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Fri, 21 Aug 2020 10:20:59 +0200 Subject: [PATCH 2/3] Update cloud.spec --- packaging/centos8/cloud.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec index ac515cd6ec87..c30702f04db1 100644 --- a/packaging/centos8/cloud.spec +++ b/packaging/centos8/cloud.spec @@ -462,14 +462,14 @@ fi %post usage if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then - echo Replacing db.properties with management server db.properties + echo Replacing usage server's db.properties with a link to the management server's db.properties rm -f %{_sysconfdir}/%{name}/usage/db.properties ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true fi if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then - echo Replacing key with management server key + echo Replacing usage server's key with a link to the management server's key rm -f %{_sysconfdir}/%{name}/usage/key ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi From b3eacaffe99f9f88265aef8a1d5edec23914dece Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Fri, 21 Aug 2020 10:30:14 +0200 Subject: [PATCH 3/3] Update cloudstack-usage.postinst --- debian/cloudstack-usage.postinst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst index e51a305dcc3a..fc4a46b4eb70 100755 --- a/debian/cloudstack-usage.postinst +++ b/debian/cloudstack-usage.postinst @@ -24,6 +24,7 @@ case "$1" in # Linking usage server db.properties to management server db.properties if [ -f "/etc/cloudstack/management/db.properties" ]; then + echo Replacing usage server's db.properties with a link to the management server's db.properties rm -f /etc/cloudstack/usage/db.properties ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties fi @@ -35,6 +36,7 @@ case "$1" in # Replacing key with management server key if [ -f "/etc/cloudstack/management/key" ]; then + echo Replacing usage server's key with a link to the management server's key rm -f /etc/cloudstack/usage/key ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key fi