aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/manila-share.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2017-07-11 12:20:05 +0200
committerEmilien Macchi <emilien@redhat.com>2017-07-25 22:08:06 +0000
commited0b77ff93a1a1e071d32f6a758e04c6d0b041ef (patch)
tree975ee7d60c61e23bbefb9fd4cf89bff2aa460d44 /docker/services/manila-share.yaml
parent0ea4dfc869b9d3438d02a2cc82aeceab32bb8998 (diff)
Provides Ceph config into OpenStack clients
Given ceph-ansible or puppet-ceph will have created the Ceph config files and keyrings in /etc/ceph on baremetal, this change copies into the OpenStack containers the necessary files for the services to be able to connect to the Ceph cluster. Change-Id: Ibc9964902637429209d4e1c1563b462c60090365
Diffstat (limited to 'docker/services/manila-share.yaml')
-rw-r--r--docker/services/manila-share.yaml11
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml
index 09d1a57..b427815 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