Merge "Use neutron-server image for neutron services"
This commit is contained in:
commit
ea1008f09f
|
@ -15,7 +15,7 @@ parameters:
|
|||
# we configure all neutron services in the same neutron
|
||||
DockerNeutronConfigImage:
|
||||
description: image
|
||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
||||
default: 'centos-binary-neutron-server:latest'
|
||||
type: string
|
||||
EndpointMap:
|
||||
default: {}
|
||||
|
|
|
@ -15,7 +15,7 @@ parameters:
|
|||
# we configure all neutron services in the same neutron
|
||||
DockerNeutronConfigImage:
|
||||
description: image
|
||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
||||
default: 'centos-binary-neutron-server:latest'
|
||||
type: string
|
||||
EndpointMap:
|
||||
default: {}
|
||||
|
|
|
@ -15,7 +15,7 @@ parameters:
|
|||
# we configure all neutron services in the same neutron
|
||||
DockerNeutronConfigImage:
|
||||
description: image
|
||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
||||
default: 'centos-binary-neutron-server:latest'
|
||||
type: string
|
||||
ServiceNetMap:
|
||||
default: {}
|
||||
|
|
|
@ -12,6 +12,10 @@ parameters:
|
|||
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
|
||||
|
@ -61,10 +65,10 @@ outputs:
|
|||
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:
|
||||
- '/'
|
||||
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
|
||||
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
|
||||
kolla_config:
|
||||
/var/lib/kolla/config_files/neutron-openvswitch-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
|
||||
|
@ -75,7 +79,10 @@ outputs:
|
|||
docker_config:
|
||||
step_4:
|
||||
neutronovsagent:
|
||||
image: *neutron_ovs_agent_image
|
||||
image: &neutron_ovs_agent_image
|
||||
list_join:
|
||||
- '/'
|
||||
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
|
||||
net: host
|
||||
pid: host
|
||||
privileged: true
|
||||
|
|
|
@ -21,7 +21,7 @@ parameters:
|
|||
type: string
|
||||
DockerNeutronConfigImage:
|
||||
description: image
|
||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
||||
default: 'centos-binary-neutron-server:latest'
|
||||
type: string
|
||||
DefaultPasswords:
|
||||
default: {}
|
||||
|
|
Loading…
Reference in New Issue