From 296887632df2707f4cbf32e1cdfc3f4a653c06db Mon Sep 17 00:00:00 2001 From: Alan Bishop Date: Tue, 6 Mar 2018 09:47:22 -0500 Subject: [PATCH] Assign Cinder's backend_host when deploying for HA When deploying for HA, set cinder's backend_host option (not the host option) to "hostgroup". That way, only the cinder-volume backend drivers use a common value. Closes-Bug: #1753596 Depends-On: I78a88725d297794efd854fbfb14df0611e0e0738 Change-Id: Ifa4cd1f43fd5d73fc21630cee45b9f38fa882349 (cherry picked from commit 99ea8b681f11679c50920f291a744a7b31a7511d) --- docker/services/pacemaker/cinder-volume.yaml | 2 +- puppet/services/pacemaker/cinder-volume.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml index 37af841ec9..ed2b934382 100644 --- a/docker/services/pacemaker/cinder-volume.yaml +++ b/docker/services/pacemaker/cinder-volume.yaml @@ -94,7 +94,7 @@ outputs: tripleo::profile::pacemaker::cinder::volume_bundle::docker_environment: {get_attr: [CinderCommon, cinder_volume_environment]} cinder::volume::manage_service: false cinder::volume::enabled: false - cinder::host: hostgroup + cinder::backend_host: hostgroup logging_source: {get_attr: [CinderBase, role_data, logging_source]} logging_groups: {get_attr: [CinderBase, role_data, logging_groups]} service_config_settings: {get_attr: [CinderBase, role_data, service_config_settings]} diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml index 6440cbf097..92320d57e5 100644 --- a/puppet/services/pacemaker/cinder-volume.yaml +++ b/puppet/services/pacemaker/cinder-volume.yaml @@ -54,7 +54,7 @@ outputs: - get_attr: [CinderVolumeBase, role_data, config_settings] - cinder::volume::manage_service: false cinder::volume::enabled: false - cinder::host: hostgroup + cinder::backend_host: hostgroup step_config: include ::tripleo::profile::pacemaker::cinder::volume upgrade_tasks: