summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-03 16:40:41 +0000
committerGerrit Code Review <review@openstack.org>2016-10-03 16:40:41 +0000
commit85fff5d679c3971c50eb5eb8faed8a7c6f23b547 (patch)
tree0cb17f2a248212e34c8961f9fc6b3656a9e6559f /puppet
parent64dc5fabbd53752b68e27279bd07e204ddcdc915 (diff)
parent7822c9756a80f0d49a25c668e70628fa051fbdf9 (diff)
Merge "Cinder volume service is not managed by Pacemaker on BlockStorage"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/cinder-base.yaml1
-rw-r--r--puppet/services/pacemaker/cinder-volume.yaml1
2 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml
index 93ab1d79..59c9b844 100644
--- a/puppet/services/cinder-base.yaml
+++ b/puppet/services/cinder-base.yaml
@@ -66,7 +66,6 @@ outputs:
cinder::rabbit_password: {get_param: RabbitPassword}
cinder::rabbit_port: {get_param: RabbitClientPort}
cinder::rabbit_heartbeat_timeout_threshold: 60
- cinder::host: hostgroup
cinder::cron::db_purge::destination: '/dev/null'
cinder::db::database_db_max_retries: -1
cinder::db::database_max_retries: -1
diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml
index 11b9bf8f..d91a0181 100644
--- a/puppet/services/pacemaker/cinder-volume.yaml
+++ b/puppet/services/pacemaker/cinder-volume.yaml
@@ -41,5 +41,6 @@ outputs:
- get_attr: [CinderVolumeBase, role_data, config_settings]
- cinder::volume::manage_service: false
cinder::volume::enabled: false
+ cinder::host: hostgroup
step_config:
include ::tripleo::profile::pacemaker::cinder::volume