diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-26 17:04:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-26 17:04:46 +0000 |
| commit | 09b9b70c5d64608d7d8432aa371f537ce3bdef25 (patch) | |
| tree | 7a5e8b7d2faa743484694494451395ea26f9f5a1 /manifests/profile/base/ceilometer/agent | |
| parent | 019efc9378f5b928c80dae11dc7e74ab6171e009 (diff) | |
| parent | daf64974d89db6bffe1fd99b344b18d682d9f237 (diff) | |
Merge "Move ceilometer upgrade step out of base"
Diffstat (limited to 'manifests/profile/base/ceilometer/agent')
| -rw-r--r-- | manifests/profile/base/ceilometer/agent/notification.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/ceilometer/agent/polling.pp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/profile/base/ceilometer/agent/notification.pp b/manifests/profile/base/ceilometer/agent/notification.pp index 7fe8e81..3fa139a 100644 --- a/manifests/profile/base/ceilometer/agent/notification.pp +++ b/manifests/profile/base/ceilometer/agent/notification.pp @@ -27,6 +27,7 @@ class tripleo::profile::base::ceilometer::agent::notification ( $step = hiera('step'), ) { include ::tripleo::profile::base::ceilometer + include ::tripleo::profile::base::ceilometer::upgrade if $step >= 4 { include ::ceilometer::agent::auth diff --git a/manifests/profile/base/ceilometer/agent/polling.pp b/manifests/profile/base/ceilometer/agent/polling.pp index 3706c2e..fedf035 100644 --- a/manifests/profile/base/ceilometer/agent/polling.pp +++ b/manifests/profile/base/ceilometer/agent/polling.pp @@ -51,6 +51,10 @@ class tripleo::profile::base::ceilometer::agent::polling ( ) { include ::tripleo::profile::base::ceilometer + if $central_namespace { + include ::tripleo::profile::base::ceilometer::upgrade + } + if $step >= 4 { include ::ceilometer::agent::auth class { '::ceilometer::agent::polling': @@ -60,5 +64,4 @@ class tripleo::profile::base::ceilometer::agent::polling ( coordination_url => join(['redis://:', $ceilometer_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/']), } } - } |