aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/neutron-l3.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-03-06 13:58:10 -0500
committerMartin André <m.andre@redhat.com>2017-03-10 08:35:57 +0100
commitab83e7731c78d44b05243d6242d026a97f4e170a (patch)
tree5ef4da6dae081398258ea8f27f6870f82e5dd6ce /docker/services/neutron-l3.yaml
parent78b7a7ed8a6b9af70f300d98f1c7f1c4eb715629 (diff)
Remove docker_image sections (unused)
We don't use docker_image for anything. It is a remant of the pre-composable docker templates and we can now remove it. This patch removes references to the 'docker_image' section from docker/post.yaml and all of the docker/services* templates. Change-Id: I208c1ef1550ab39ab0ee47ab282f9b1937379810
Diffstat (limited to 'docker/services/neutron-l3.yaml')
-rw-r--r--docker/services/neutron-l3.yaml10
1 files changed, 4 insertions, 6 deletions
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index d9a78288..61ad8f4a 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -49,11 +49,6 @@ outputs:
config_settings: {get_attr: [NeutronL3Base, role_data, config_settings]}
step_config: &step_config
get_attr: [NeutronL3Base, role_data, step_config]
- docker_image: &neutron_l3_agent_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
-
puppet_config:
puppet_tags: neutron_config,neutron_l3_agent_config
config_volume: neutron
@@ -77,7 +72,10 @@ outputs:
docker_config:
step_4:
neutronl3agent:
- image: *neutron_l3_agent_image
+ image: &neutron_l3_agent_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
net: host
pid: host
privileged: true