Fix Manila when run without pacemaker

The supported path is to run the manila-share service
under control of pacemaker using container bundles started
in Step5.  However, it is useful for test and POC purposes
to be able to run the manila-share service without pacemaker
control as a regular container started in Step4.

This change fixes the non-pacemaker deployment path, which runs
manila-share in Step4 rather than Step5, so that it uses the same
privileges for the manila-share container as are used for the
pacemaker-controlled container-bundle in Step5.

However. we do not change scenario004 to deploy manila using the
non-pacemaker path since in CI we want to test the path that is
supported for customers.

Change-Id: I8effea96a4428281b5a5dfa9711bb602fdbdc705
Related-Bug: #1841941
(cherry picked from commit cff553c7e6)
(cherry picked from commit 68a4e125bb)
This commit is contained in:
Tom Barron 2019-08-29 20:38:15 -04:00
parent 8a75427d69
commit 24d1d91d8c
1 changed files with 5 additions and 0 deletions

View File

@ -105,6 +105,9 @@ outputs:
- path: /var/log/manila
owner: manila:manila
recurse: true
- path: /var/lib/manila
owner: manila:manila
recurse: true
- path:
str_replace:
template: /etc/ceph/CLUSTER.client.USER.keyring
@ -118,6 +121,8 @@ outputs:
manila_share:
image: &manila_share_image {get_param: DockerManilaShareImage}
net: host
ipc: host
user: root
restart: always
volumes: {get_attr: [ManilaCommon, manila_share_volumes]}
environment: {get_attr: [ManilaCommon, manila_share_environment]}