Commit ff86279a authored by David Johnson's avatar David Johnson

Ceilometer dbsync change for Queens.

parent 7fc33e24
......@@ -3111,7 +3111,11 @@ EOF
chmod -R 770 /var/lib/gnocchi
gnocchi-upgrade
ceilometer-upgrade --skip-metering-database
if [ $OSVERSION -lt $OSQUEENS ]; then
ceilometer-upgrade --debug --skip-metering-database
else
ceilometer-upgrade --debug
fi
fi
#
......@@ -3300,7 +3304,11 @@ EOF
service_enable grafana-gnocchi-openstack-token-renewer
service_restart grafana-gnocchi-openstack-token-renewer
ceilometer-upgrade --debug --skip-metering-database
if [ $OSVERSION -lt $OSQUEENS ]; then
ceilometer-upgrade --debug --skip-metering-database
else
ceilometer-upgrade --debug
fi
# Finally, dump a simple default dashboard into place.
AUTHSTR=`echo "import base64; import sys; sys.stdout.write(base64.b64encode('admin:$GPASSWD'));" | python`
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment