aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/neutron-plugin-ml2.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-plugin-ml2.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-plugin-ml2.yaml')
-rw-r--r--docker/services/neutron-plugin-ml2.yaml11
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml
index 37ab8db2..5d1a348a 100644
--- a/docker/services/neutron-plugin-ml2.yaml
+++ b/docker/services/neutron-plugin-ml2.yaml
@@ -44,15 +44,18 @@ 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: &docker_image
list_join:
- '/'
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
- puppet_tags: ''
- config_volume: 'neutron'
- config_image: *docker_image
+ puppet_config:
+ config_volume: 'neutron'
+ puppet_tags: ''
+ step_config: *step_config
+ config_image: *docker_image
kolla_config: {}
docker_config: {}