aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--puppet/services/pacemaker/manila-share.yaml3
-rw-r--r--releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml9
2 files changed, 12 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml
index 61bf458..8a28201 100644
--- a/puppet/services/pacemaker/manila-share.yaml
+++ b/puppet/services/pacemaker/manila-share.yaml
@@ -52,5 +52,8 @@ outputs:
config_settings:
map_merge:
- get_attr: [ManilaShareBase, role_data, config_settings]
+ - manila::share::manage_service: false
+ manila::share::enabled: false
+ manila::host: hostgroup
step_config: |
include ::tripleo::profile::pacemaker::manila
diff --git a/releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml b/releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml
new file mode 100644
index 0000000..ff0904b
--- /dev/null
+++ b/releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+ - Set "host" parameter in manila.conf to 'hostgroup' when running
+ manila share service under pacemaker. This labels instances of
+ the service on different nodes with the same "host" as cinder does
+ in this circumstance so that the instances are considered by
+ OpenStack to provide the same service and manila share is able to
+ maintain management of shares on the backend after failover and
+ failback.