Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "N->O upgrade, blanks ipv6 rules before activating it."
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
neutron-dhcp.yaml
diff --git
a/docker/services/neutron-dhcp.yaml
b/docker/services/neutron-dhcp.yaml
index
a4854d9
..
9be13ad
100644
(file)
--- a/
docker/services/neutron-dhcp.yaml
+++ b/
docker/services/neutron-dhcp.yaml
@@
-8,7
+8,7
@@
parameters:
description: namespace
default: 'tripleoupstream'
type: string
description: namespace
default: 'tripleoupstream'
type: string
- DockerNeutron
Api
Image:
+ DockerNeutron
DHCP
Image:
description: image
default: 'centos-binary-neutron-dhcp-agent:latest'
type: string
description: image
default: 'centos-binary-neutron-dhcp-agent:latest'
type: string
@@
-76,10
+76,10
@@
outputs:
docker_config:
step_4:
neutron_dhcp:
docker_config:
step_4:
neutron_dhcp:
- image:
&neutron_dhcp_image
+ image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerNeutron
Api
Image} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerNeutron
DHCP
Image} ]
net: host
pid: host
privileged: true
net: host
pid: host
privileged: true