aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/neutron-l3.yaml
diff options
context:
space:
mode:
authorIan Main <imain@redhat.com>2017-07-12 11:41:57 +1200
committerSteve Baker <sbaker@redhat.com>2017-07-14 22:23:02 +0000
commite76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (patch)
tree60a70ecea0270e721011460a817ba441a7989a2a /docker/services/neutron-l3.yaml
parentd1fcf403dc85b25882c25d36b36ea97b56f05186 (diff)
Use a single configuration file for specifying docker containers.
This removes the default container names from all the templates and uses a single environment file to specify the full container name and registry from which to pull. Also does away with most of DockerNamespace. Change-Id: Ieaedac33f0a25a352ab432cdb00b5c888be4ba27 Depends-On: Ibc108871ebc2beb1baae437105b2da1d0123ba60 Co-Authored-By: Dan Prince <dprince@redhat.com> Co-Authored-By: Steve Baker <sbaker@redhat.com>
Diffstat (limited to 'docker/services/neutron-l3.yaml')
-rw-r--r--docker/services/neutron-l3.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml
index 1db48b3..ce1490c 100644
--- a/docker/services/neutron-l3.yaml
+++ b/docker/services/neutron-l3.yaml
@@ -4,17 +4,11 @@ description: >
OpenStack containerized Neutron L3 agent
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerNeutronL3AgentImage:
description: image
- default: 'centos-binary-neutron-l3-agent:latest'
type: string
DockerNeutronConfigImage:
description: The container image to use for the neutron config_volume
- default: 'centos-binary-neutron-server:latest'
type: string
ServiceNetMap:
default: {}
@@ -65,10 +59,7 @@ outputs:
puppet_tags: neutron_config,neutron_l3_agent_config
config_volume: neutron
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
+ config_image: {get_param: DockerNeutronConfigImage}
kolla_config:
/var/lib/kolla/config_files/neutron_l3_agent.json:
command: /usr/bin/neutron-l3-agent --config-file /usr/share/neutron/neutron-dist.conf --config-dir /usr/share/neutron/l3_agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-l3-agent
@@ -84,10 +75,7 @@ outputs:
docker_config:
step_4:
neutron_l3_agent:
- image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNeutronL3AgentImage} ]
+ image: {get_param: DockerNeutronL3AgentImage}
net: host
pid: host
privileged: true