diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-15 06:19:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-15 06:19:13 +0000 |
| commit | 2185b835602ffb276b8142db68d472611fdf127a (patch) | |
| tree | 50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/neutron-dhcp.yaml | |
| parent | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff) | |
| parent | e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff) | |
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/neutron-dhcp.yaml')
| -rw-r--r-- | docker/services/neutron-dhcp.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index 99ccba3c..c7444070 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -4,17 +4,11 @@ description: > OpenStack containerized Neutron DHCP service parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerNeutronDHCPImage: description: image - default: 'centos-binary-neutron-dhcp-agent:latest' type: string DockerNeutronConfigImage: description: The container image to use for the neutron config_volume - default: 'centos-binary-neutron-server:latest' type: string EndpointMap: default: {} @@ -74,10 +68,7 @@ outputs: 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} ] + config_image: {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 --config-dir /etc/neutron/conf.d/common --config-dir /etc/neutron/conf.d/neutron-dhcp-agent @@ -93,10 +84,7 @@ outputs: docker_config: step_4: neutron_dhcp: - image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerNeutronDHCPImage} ] + image: {get_param: DockerNeutronDHCPImage} net: host pid: host privileged: true |