manila: set "host" to "hostgroup"

when running manila-share under control of pacemaker, as
is done for cinder-volume service in the same circumstance.

Change-Id: Ic97f01913bae2a388c962a38fa175eb1d763cdcb
Depends-On: Ie31f2d5ccf458f5fcfe8bec5f2c37f45070cfde2
Closes-Bug: #1712842
(cherry picked from commit 8fa6c6e58c7ac0d32bf2f0dfb586683cf006e3bf)

diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml
index 61bf458..8a28201 100644 (file)
--- 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 (file)
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.