diff options
| author |   Alex Schultz <aschultz@redhat.com> | 2016-09-30 09:55:24 -0600 |
|---|---|---|
| committer | Alex Schultz <aschultz@redhat.com> | 2016-10-07 15:17:04 +0000 |
| commit | 8e70fc19eca7149dff793751fc7a7f5fd2ad74f5 (patch) | |
| tree | dc755c2c71d55167cf079f6b0daed44718719496 /manifests | |
| parent | 41dac693cfcdf2ece25d3257b0d82110a1cb3162 (diff) | |
Only run ceilometer::db::sync on bootstrap node
The ceilometer::db::sync is included by default in ceilometer::db but we
only want it to run on the bootstrap node. This change passes the
sync_db parameter to ceilometer::db to manage the db sync process rather
than trying to manage the inclusion of ceilometer::db::sync within the
profile class.
Change-Id: Ib56db1a90dd6fbfe7582fc57b7728df81942cce2
Closes-Bug: #1629373
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/ceilometer/collector.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp index 443873f..3c0a361 100644 --- a/manifests/profile/base/ceilometer/collector.pp +++ b/manifests/profile/base/ceilometer/collector.pp @@ -60,10 +60,6 @@ class tripleo::profile::base::ceilometer::collector ( include ::tripleo::profile::base::ceilometer - if $step >= 3 and $sync_db { - include ::ceilometer::db::sync - } - if $step >= 4 or ($step >= 3 and $sync_db) { if downcase($ceilometer_backend) == 'mongodb' { if empty($mongodb_node_ips) { @@ -88,10 +84,13 @@ class tripleo::profile::base::ceilometer::collector ( $ceilometer_mongodb_conn_string = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}" class { '::ceilometer::db' : + sync_db => $sync_db, database_connection => $ceilometer_mongodb_conn_string, } } else { - include ::ceilometer::db + class { '::ceilometer::db' : + sync_db => $sync_db, + } } include ::ceilometer::collector include ::ceilometer::dispatcher::gnocchi |