diff options
| author |   Pradeep Kilambi <pkilambi@redhat.com> | 2017-05-24 16:10:55 -0400 |
|---|---|---|
| committer | Pradeep Kilambi <pkilambi@redhat.com> | 2017-05-24 16:44:41 -0400 |
| commit | daf64974d89db6bffe1fd99b344b18d682d9f237 (patch) | |
| tree | 4534b566ea18954220d2ca5f020dc089ff52e3d5 /manifests/profile/base/ceilometer/agent | |
| parent | 066dc2cecf5a30d4a0cf541b32a2ae45ae5de30a (diff) | |
Move ceilometer upgrade step out of base
ceilometer-upgrade should only run on controller nodes.
Since its currently in base profile, it gets triggered
on compute as well. So instead split out the upgrade
into its own and include when we deploy notification
and central agents instead.
Change-Id: I2910e8aa5da7fded4cf94b57fb0a14fefd88adbe
Closes-bug: #1693339
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/']), } } - } |