aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/glance-api.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/glance-api.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/glance-api.yaml')
-rw-r--r--docker/services/glance-api.yaml9
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