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
Containerize Sahara
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
neutron-ovs-agent.yaml
diff --git
a/docker/services/neutron-ovs-agent.yaml
b/docker/services/neutron-ovs-agent.yaml
index
ac52b37
..
65ad21e
100644
(file)
--- a/
docker/services/neutron-ovs-agent.yaml
+++ b/
docker/services/neutron-ovs-agent.yaml
@@
-12,6
+12,10
@@
parameters:
description: image
default: 'centos-binary-neutron-openvswitch-agent:latest'
type: string
description: image
default: 'centos-binary-neutron-openvswitch-agent:latest'
type: string
+ DockerNeutronConfigImage:
+ description: image
+ default: 'centos-binary-neutron-server:latest'
+ type: string
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-28,6
+32,7
@@
parameters:
RoleParameters:
default: {}
description: Parameters specific to the role
RoleParameters:
default: {}
description: Parameters specific to the role
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-60,12
+65,12
@@
outputs:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
step_config: *step_config
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
step_config: *step_config
- config_image:
&neutron_ovs_agent_image
+ config_image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: Docker
Openvswitch
Image} ]
+ - [ {get_param: DockerNamespace}, {get_param: Docker
NeutronConfig
Image} ]
kolla_config:
kolla_config:
- /var/lib/kolla/config_files/neutron
-openvswitch-
agent.json:
+ /var/lib/kolla/config_files/neutron
_ovs_
agent.json:
command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
permissions:
- path: /var/log/neutron
command: /usr/bin/neutron-openvswitch-agent --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
permissions:
- path: /var/log/neutron
@@
-73,8
+78,11
@@
outputs:
recurse: true
docker_config:
step_4:
recurse: true
docker_config:
step_4:
- neutronovsagent:
- image: *neutron_ovs_agent_image
+ neutron_ovs_agent:
+ image: &neutron_ovs_agent_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
net: host
pid: host
privileged: true
net: host
pid: host
privileged: true
@@
-83,7
+91,7
@@
outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- - /var/lib/kolla/config_files/neutron
-openvswitch-
agent.json:/var/lib/kolla/config_files/config.json:ro
+ - /var/lib/kolla/config_files/neutron
_ovs_
agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- /lib/modules:/lib/modules:ro
- /run:/run
- /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
- /lib/modules:/lib/modules:ro
- /run:/run