From 343ea6098e1884df410484149ed71ad8f51f4ec3 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Tue, 12 Jul 2016 08:46:11 +0200 Subject: [PATCH] packaging: Add db.X.driver=jdbc:mysql to db.properties on upgrade This is required afther the upgrade to 4.9.0 and for convience we add this to the configuration so our users do not have to. --- debian/cloudstack-management.postinst | 5 +++++ packaging/centos63/cloud.spec | 4 ++++ packaging/centos7/cloud.spec | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst index 145d1eaa177a..e37813f528c9 100644 --- a/debian/cloudstack-management.postinst +++ b/debian/cloudstack-management.postinst @@ -58,6 +58,11 @@ if [ "$1" = configure ]; then chmod 0640 /etc/cloudstack/management/db.properties chgrp cloud /etc/cloudstack/management/db.properties invoke-rc.d tomcat6 stop || true + + # Add jdbc MySQL driver settings to db.properties if not present + grep "db.cloud.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.cloud.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + grep "db.usage.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.usage.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + grep "db.simulator.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.simulator.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties fi #DEBHELPER# diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index c267e8fdfee6..285839519d88 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -408,6 +408,10 @@ if [ "$1" == "1" ] ; then /sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true fi +grep "db.cloud.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.cloud.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.usage.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.usage.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.simulator.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.simulator.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/ diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index b99d950d8382..8d2ddc404505 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -363,6 +363,10 @@ if [ "$1" == "1" ] ; then /usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true fi +grep "db.cloud.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.cloud.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.usage.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.usage.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.simulator.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.simulator.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/