openstack/charm-ceilometer-agent
Code Issues Proposed changes

Update config to support upgrade with db sync in maintainer scripts

Browse Source
This commit is contained in:
James Page
2014-04-01 17:45:01 +01:00
parent 061a3ed9bb
commit 53061c8f3c
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/grizzly/ceilometer.conf
View File

@@ -18,3 +18,6 @@ os_username = {{ admin_user }}
os_password = {{ admin_password }} os_password = {{ admin_password }}
{% endif -%} {% endif -%}
logdir = /var/log/ceilometer logdir = /var/log/ceilometer
# NOTE(jamespage) this allows the db sync process to run OK for upgrades
# fixed in icehouse
database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite

5
templates/havana/ceilometer.conf
View File

@@ -20,3 +20,8 @@ os_password = {{ admin_password }}
[publisher_rpc] [publisher_rpc]
metering_secret = {{ metering_secret }} metering_secret = {{ metering_secret }}
{% endif -%} {% endif -%}
[database]
# NOTE(jamespage) this allows the db sync process to run OK for upgrades
# fixed in icehouse
backend=sqlalchemy
connection=sqlite:////var/lib/ceilometer/$sqlite_db