diff options
| author |   Tom Barron <tpb@dyncloud.net> | 2017-08-24 12:27:20 -0400 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-08-29 03:27:28 +0000 |
| commit | 1f3cb179b8e668f9a4e2c2307b60b4ceecd877f4 (patch) | |
| tree | ac1954c6a264fd13ade2203a4a20d03dc82af0fc | |
| parent | 3dfffebaaef84c390e089d325c3c41f2182cd08e (diff) | |
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)
| -rw-r--r-- | puppet/services/pacemaker/manila-share.yaml | 3 | ||||
| -rw-r--r-- | releasenotes/notes/add-hostgroup-default-for-host-parameter-02e3d48de1f69765.yaml | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml index 61bf4580..8a282014 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 00000000..ff0904b8 --- /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. |