diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-04 23:29:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-04 23:29:13 +0000 |
| commit | ac03bcfffef5a83df4a458cbc92117ada6cf7301 (patch) | |
| tree | d0de725800b3a5c45d4d321270806cfd7a4ad02f /docker/services/glance-api.yaml | |
| parent | 1b09a3d6e295f602c118c6656d1abce8614f915c (diff) | |
| parent | 91e7a548cb4e39e72798c8cda16f3a946128a419 (diff) | |
Merge "Remove kolla_config copy from services"
Diffstat (limited to 'docker/services/glance-api.yaml')
| -rw-r--r-- | docker/services/glance-api.yaml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index 77e4aa01..fdfdbc68 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -58,17 +58,8 @@ outputs: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ] kolla_config: - /var/lib/kolla/config_files/glance-api.json: - command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf - config_files: - - dest: /etc/glance/glance-api.conf - owner: glance - perm: '0600' - source: /var/lib/kolla/config_files/src/etc/glance/glance-api.conf - - dest: /etc/glance/glance-swift.conf - owner: glance - perm: '0600' - source: /var/lib/kolla/config_files/src/etc/glance/glance-swift.conf + /var/lib/kolla/config_files/glance-api.json: + command: /usr/bin/glance-api --config-file /usr/share/glance/glance-api-dist.conf --config-file /etc/glance/glance-api.conf docker_config: step_3: glance_api_db_sync: @@ -78,9 +69,9 @@ outputs: detach: false volumes: &glance_volumes - /var/lib/kolla/config_files/glance-api.json:/var/lib/kolla/config_files/config.json + - /var/lib/config-data/glance_api/etc/glance/:/etc/glance/:ro - /etc/localtime:/etc/localtime:ro - /lib/modules:/lib/modules:ro - - /var/lib/config-data/glance_api/:/var/lib/kolla/config_files/src:ro - /run:/run - /dev:/dev - /etc/hosts:/etc/hosts:ro |