aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/neutron-dhcp.yaml
diff options
context:
space:
mode:
authorSteve Baker <sbaker@redhat.com>2017-03-01 03:09:31 +0000
committerSteve Baker <sbaker@redhat.com>2017-03-01 21:37:54 +0000
commit610850140d605b18f4a28099f160fff1e489443d (patch)
treee306e29a9f8e5909f987dd00ec525dc92ead6322 /docker/services/neutron-dhcp.yaml
parentebee7ecfa70b5defe897995c72effa60538ccffc (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/neutron-dhcp.yaml')
-rw-r--r--docker/services/neutron-dhcp.yaml17
1 files changed, 10 insertions, 7 deletions
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml
index fc13b3d1..15f3055e 100644
--- a/docker/services/neutron-dhcp.yaml
+++ b/docker/services/neutron-dhcp.yaml
@@ -49,19 +49,22 @@ outputs:
config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, config_settings]
- step_config: {get_attr: [NeutronBase, role_data, step_config]}
+ step_config: &step_config
+ get_attr: [NeutronBase, role_data, step_config]
service_config_settings: {get_attr: [NeutronBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS
docker_image: &neutron_dhcp_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronApiImage} ]
- puppet_tags: neutron_config,neutron_dhcp_agent_config
- config_volume: neutron
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+ puppet_config:
+ config_volume: neutron
+ puppet_tags: neutron_config,neutron_dhcp_agent_config
+ step_config: *step_config
+ config_image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
kolla_config:
/var/lib/kolla/config_files/neutron_dhcp.json:
command: /usr/bin/neutron-dhcp-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/dhcp_agent.ini --log-file /var/log/neutron/dhcp-agent.log