Usage-server update message improvement (#4278)

* Update cloud.spec

* Update cloud.spec

* Update cloudstack-usage.postinst
This commit is contained in:
Andrija Panic 2020-08-23 12:34:38 +02:00 committed by GitHub
parent bb73bedb55
commit cddf69c0f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions

View File

@ -24,6 +24,7 @@ case "$1" in
# Linking usage server db.properties to management server db.properties # Linking usage server db.properties to management server db.properties
if [ -f "/etc/cloudstack/management/db.properties" ]; then 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 rm -f /etc/cloudstack/usage/db.properties
ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties
fi fi
@ -35,6 +36,7 @@ case "$1" in
# Replacing key with management server key # Replacing key with management server key
if [ -f "/etc/cloudstack/management/key" ]; then 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 rm -f /etc/cloudstack/usage/key
ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key
fi fi

View File

@ -465,14 +465,14 @@ fi
%post usage %post usage
if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then 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 rm -f %{_sysconfdir}/%{name}/usage/db.properties
ln -s %{_sysconfdir}/%{name}/management/db.properties %{_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 /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true
fi fi
if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then 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 rm -f %{_sysconfdir}/%{name}/usage/key
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
fi fi

View File

@ -462,14 +462,14 @@ fi
%post usage %post usage
if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then 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 rm -f %{_sysconfdir}/%{name}/usage/db.properties
ln -s %{_sysconfdir}/%{name}/management/db.properties %{_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 /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true
fi fi
if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then 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 rm -f %{_sysconfdir}/%{name}/usage/key
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
fi fi