Use neutron-server image for neutron services
For TLS everywhere, neutron-server needs httpd in the image, since it'll use a separate container that runs a TLS proxy to terminate the connection. This requires the image where the configuration is ran to have httpd installed, since there are several directories and the user/group that's needed. So, we then switch the image to be used to be neutron-server instead of the openvswitch-agent image. Change-Id: Ie16de3004925b7624f106d6c015ec04ef6031a06 Depends-On: I82f10ac0e7e692e6ba4a06dc10da9eaf79c60e7e
This commit is contained in:
parent
93bb4648f9
commit
563a900be0
|
@ -15,7 +15,7 @@ parameters:
|
||||||
# we configure all neutron services in the same neutron
|
# we configure all neutron services in the same neutron
|
||||||
DockerNeutronConfigImage:
|
DockerNeutronConfigImage:
|
||||||
description: image
|
description: image
|
||||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
default: 'centos-binary-neutron-server:latest'
|
||||||
type: string
|
type: string
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
|
|
|
@ -15,7 +15,7 @@ parameters:
|
||||||
# we configure all neutron services in the same neutron
|
# we configure all neutron services in the same neutron
|
||||||
DockerNeutronConfigImage:
|
DockerNeutronConfigImage:
|
||||||
description: image
|
description: image
|
||||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
default: 'centos-binary-neutron-server:latest'
|
||||||
type: string
|
type: string
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
|
|
|
@ -15,7 +15,7 @@ parameters:
|
||||||
# we configure all neutron services in the same neutron
|
# we configure all neutron services in the same neutron
|
||||||
DockerNeutronConfigImage:
|
DockerNeutronConfigImage:
|
||||||
description: image
|
description: image
|
||||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
default: 'centos-binary-neutron-server:latest'
|
||||||
type: string
|
type: string
|
||||||
ServiceNetMap:
|
ServiceNetMap:
|
||||||
default: {}
|
default: {}
|
||||||
|
|
|
@ -12,6 +12,10 @@ parameters:
|
||||||
description: image
|
description: image
|
||||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
||||||
type: string
|
type: string
|
||||||
|
DockerNeutronConfigImage:
|
||||||
|
description: image
|
||||||
|
default: 'centos-binary-neutron-server:latest'
|
||||||
|
type: string
|
||||||
ServiceNetMap:
|
ServiceNetMap:
|
||||||
default: {}
|
default: {}
|
||||||
description: Mapping of service_name -> network name. Typically set
|
description: Mapping of service_name -> network name. Typically set
|
||||||
|
@ -61,10 +65,10 @@ outputs:
|
||||||
config_volume: neutron
|
config_volume: neutron
|
||||||
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
|
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
|
||||||
step_config: *step_config
|
step_config: *step_config
|
||||||
config_image: &neutron_ovs_agent_image
|
config_image:
|
||||||
list_join:
|
list_join:
|
||||||
- '/'
|
- '/'
|
||||||
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
|
- [ {get_param: DockerNamespace}, {get_param: DockerNeutronConfigImage} ]
|
||||||
kolla_config:
|
kolla_config:
|
||||||
/var/lib/kolla/config_files/neutron-openvswitch-agent.json:
|
/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
|
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:
|
docker_config:
|
||||||
step_4:
|
step_4:
|
||||||
neutronovsagent:
|
neutronovsagent:
|
||||||
image: *neutron_ovs_agent_image
|
image: &neutron_ovs_agent_image
|
||||||
|
list_join:
|
||||||
|
- '/'
|
||||||
|
- [ {get_param: DockerNamespace}, {get_param: DockerOpenvswitchImage} ]
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
privileged: true
|
privileged: true
|
||||||
|
|
|
@ -21,7 +21,7 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
DockerNeutronConfigImage:
|
DockerNeutronConfigImage:
|
||||||
description: image
|
description: image
|
||||||
default: 'centos-binary-neutron-openvswitch-agent:latest'
|
default: 'centos-binary-neutron-server:latest'
|
||||||
type: string
|
type: string
|
||||||
DefaultPasswords:
|
DefaultPasswords:
|
||||||
default: {}
|
default: {}
|
||||||
|
|
Loading…
Reference in New Issue