diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-13 23:20:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-13 23:20:55 +0000 |
| commit | d410d0fddd52b6ec7a1ba5d0758a9aacdd24e06f (patch) | |
| tree | 9d8cc43d7c74189e72ad8f0dcd319de8355bc0e0 /manifests | |
| parent | 700ad3ee5381135c21a4fddcb1d952d1607fefd0 (diff) | |
| parent | 8e70fc19eca7149dff793751fc7a7f5fd2ad74f5 (diff) | |
Merge "Only run ceilometer::db::sync on bootstrap node"
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 |