From 610850140d605b18f4a28099f160fff1e489443d Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 1 Mar 2017 03:09:31 +0000 Subject: 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 --- docker/services/nova-scheduler.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docker/services/nova-scheduler.yaml') diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index a1a98b48..e3955a2b 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -46,15 +46,18 @@ outputs: value: service_name: {get_attr: [NovaSchedulerBase, role_data, service_name]} config_settings: {get_attr: [NovaSchedulerBase, role_data, config_settings]} - step_config: {get_attr: [NovaSchedulerBase, role_data, step_config]} + step_config: &step_config + get_attr: [NovaSchedulerBase, role_data, step_config] service_config_settings: {get_attr: [NovaSchedulerBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS docker_image: &nova_scheduler_image list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerNovaSchedulerImage} ] - puppet_tags: nova_config + puppet_config: config_volume: nova + puppet_tags: nova_config + step_config: *step_config config_image: list_join: - '/' -- cgit 1.2.3-korg