diff options
| author |   Steve Baker <sbaker@redhat.com> | 2017-03-01 03:09:31 +0000 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2017-03-01 21:37:54 +0000 |
| commit | 610850140d605b18f4a28099f160fff1e489443d (patch) | |
| tree | e306e29a9f8e5909f987dd00ec525dc92ead6322 /docker/services/glance-api.yaml | |
| parent | ebee7ecfa70b5defe897995c72effa60538ccffc (diff) | |
Put docker puppet config in puppet_config dict
This approach removes the need for the yaql zip to build the
docker-puppet data by building the data in a puppet_config dict.
This allows a future change to make docker-puppet.py only accept dict
data.
Currently the step_config is left where it is and referenced inside
puppet_config, but feedback is welcome whether this is necessary or
desirable.
Change-Id: I4a4d7a6fd2735cb841174af305dbb62e0b3d3e8c
Diffstat (limited to 'docker/services/glance-api.yaml')
| -rw-r--r-- | docker/services/glance-api.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index b8ab9622..ab62f7e3 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -45,16 +45,19 @@ outputs: map_merge: - get_attr: [GlanceApiPuppetBase, role_data, config_settings] - glance::api::sync_db: false - step_config: {get_attr: [GlanceApiPuppetBase, role_data, step_config]} + step_config: &step_config + get_attr: [GlanceApiPuppetBase, role_data, step_config] service_config_settings: {get_attr: [GlanceApiPuppetBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS # docker_image: &glance_image list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerGlanceApiImage} ] - puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config - config_volume: glance_api - config_image: *glance_image + puppet_config: + config_volume: glance_api + puppet_tags: glance_api_config,glance_api_paste_ini,glance_swift_config,glance_cache_config + step_config: *step_config + config_image: *glance_image 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 |