diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-26 19:58:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-26 19:58:54 +0000 |
| commit | f1395f77066eef5d9114a2b13756746f9b1adb2c (patch) | |
| tree | 25fd6e363c89debfb033ac311dfdc4a95d0171bd /docker/services/manila-share.yaml | |
| parent | 4a441359fba69b754cbae1fb13c82fb7472f29b6 (diff) | |
| parent | ed0b77ff93a1a1e071d32f6a758e04c6d0b041ef (diff) | |
Merge "Provides Ceph config into OpenStack clients"
Diffstat (limited to 'docker/services/manila-share.yaml')
| -rw-r--r-- | docker/services/manila-share.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml index 09d1a574..b4278155 100644 --- a/docker/services/manila-share.yaml +++ b/docker/services/manila-share.yaml @@ -75,9 +75,8 @@ outputs: dest: "/" merge: true preserve_properties: true - # NOTE(gfidente): ceph-ansible generated - - source: "/var/lib/kolla/config_files/src-ceph/*" - dest: "/etc/ceph" + - source: "/var/lib/kolla/config_files/src-ceph/" + dest: "/etc/ceph/" merge: true preserve_properties: true permissions: @@ -97,7 +96,7 @@ outputs: - /var/lib/kolla/config_files/manila_share.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/puppet-generated/manila/:/var/lib/kolla/config_files/src:ro - /var/log/containers/manila:/var/log/manila - - /etc/ceph/:/var/lib/kolla/config_files/src-ceph:ro + - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro environment: - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS host_prep_tasks: @@ -105,6 +104,10 @@ outputs: file: path: /var/log/containers/manila state: directory + - name: ensure ceph configurations exist + file: + path: /etc/ceph + state: directory upgrade_tasks: - name: Stop and disable manila_share service tags: step2 |