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/glance-api.yaml | |
parent | 4a441359fba69b754cbae1fb13c82fb7472f29b6 (diff) | |
parent | ed0b77ff93a1a1e071d32f6a758e04c6d0b041ef (diff) |
Merge "Provides Ceph config into OpenStack clients"
Diffstat (limited to 'docker/services/glance-api.yaml')
-rw-r--r-- | docker/services/glance-api.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index d88c64b5..f4c724b0 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -86,6 +86,10 @@ outputs: dest: "/" merge: true preserve_properties: true + - source: "/var/lib/kolla/config_files/src-ceph/" + dest: "/etc/ceph/" + merge: true + preserve_properties: true /var/lib/kolla/config_files/glance_api_tls_proxy.json: command: /usr/sbin/httpd -DFOREGROUND config_files: @@ -117,6 +121,7 @@ outputs: - /var/lib/kolla/config_files/glance_api.json:/var/lib/kolla/config_files/config.json - /var/lib/config-data/puppet-generated/glance_api/:/var/lib/kolla/config_files/src:ro - /var/log/containers/glance:/var/log/glance + - /etc/ceph:/var/lib/kolla/config_files/src-ceph:ro environment: - KOLLA_BOOTSTRAP=True - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS @@ -156,6 +161,10 @@ outputs: file: path: /var/log/containers/glance state: directory + - name: ensure ceph configurations exist + file: + path: /etc/ceph + state: directory upgrade_tasks: - name: Stop and disable glance_api service tags: step2 |