summaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker/cinder
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-01 16:18:12 +0000
committerGerrit Code Review <review@openstack.org>2016-09-01 16:18:12 +0000
commit60ce868eee7a1a3369da8418c0b4cfd8ec6e3227 (patch)
treefefcb5c856f308b1eb3c473716875bb14b1c05d0 /manifests/profile/pacemaker/cinder
parentdfd3617f5fa975e74fac4dfc1d17632d2825dd8b (diff)
parentda4bcee4d65cf2e0d48eab03a4a9582e3806238e (diff)
Merge "Write restart flags to restart services only when necessary"
Diffstat (limited to 'manifests/profile/pacemaker/cinder')
-rw-r--r--manifests/profile/pacemaker/cinder/backup.pp6
-rw-r--r--manifests/profile/pacemaker/cinder/volume.pp6
2 files changed, 12 insertions, 0 deletions
diff --git a/manifests/profile/pacemaker/cinder/backup.pp b/manifests/profile/pacemaker/cinder/backup.pp
index 20a0104..72ec456 100644
--- a/manifests/profile/pacemaker/cinder/backup.pp
+++ b/manifests/profile/pacemaker/cinder/backup.pp
@@ -47,6 +47,12 @@ class tripleo::profile::pacemaker::cinder::backup (
include ::tripleo::profile::base::cinder::backup
+ if $step >= 3 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
+ Cinder_config<||>
+ ~>
+ tripleo::pacemaker::resource_restart_flag { "${::cinder::params::backup_service}": }
+ }
+
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::cinder::params::backup_service : }
}
diff --git a/manifests/profile/pacemaker/cinder/volume.pp b/manifests/profile/pacemaker/cinder/volume.pp
index 5a581eb..82e2522 100644
--- a/manifests/profile/pacemaker/cinder/volume.pp
+++ b/manifests/profile/pacemaker/cinder/volume.pp
@@ -46,6 +46,12 @@ class tripleo::profile::pacemaker::cinder::volume (
include ::tripleo::profile::base::cinder::volume
+ if $step >= 3 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
+ Cinder_api_paste_ini<||> ~> Tripleo::Pacemaker::Resource_restart_flag["${::cinder::params::volume_service}"]
+ Cinder_config<||> ~> Tripleo::Pacemaker::Resource_restart_flag["${::cinder::params::volume_service}"]
+ tripleo::pacemaker::resource_restart_flag { "${::cinder::params::volume_service}": }
+ }
+
if $step >= 5 and $pacemaker_master {
pacemaker::resource::service { $::cinder::params::volume_service : }
}