Add "radvd_user" config parameter to Neutron L3 container

The username passed to radvd, used to drop root privileges and change
user ID to username and group ID to the primary group of username. If no
user specified, the user executing the L3 agent will be passed. If "root"
specified, because radvd is spawned as root, no "username" parameter
will be passed

Conflicts:
      deployment/neutron/neutron-l3-container-puppet.yaml

Change-Id: Ie9f16f3117e6531f4ef1e4973e61c72dbf904b8a
Closes-Bug: #1844688
(cherry picked from commit fb53535ca5)
(cherry picked from commit c37c7bd0ca)
This commit is contained in:
Rodolfo Alonso Hernandez 2019-10-30 14:27:30 +00:00
parent 83bd596e6f
commit 98032a162d
2 changed files with 17 additions and 0 deletions

View File

@ -115,6 +115,16 @@ parameters:
type: string
default: ''
NeutronL3AgentRadvdUser:
default: "root"
description: |
The username passed to radvd, used to drop root privileges and change
user ID to username and group ID to the primary group of username. If no
user specified, the user executing the L3 agent will be passed. If "root"
specified, because radvd is spawned as root, no "username" parameter
will be passed
type: string
conditions:
keepalived_wrapper_enabled: {equals: [{get_param: NeutronEnableKeepalivedWrapper}, true]}
haproxy_wrapper_enabled: {equals: [{get_param: NeutronEnableHaproxyDockerWrapper}, true]}
@ -202,6 +212,7 @@ outputs:
- external_network_bridge_empty
- {}
- neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
- neutron::agents::l3::radvd_user: {get_param: NeutronL3AgentRadvdUser}
service_config_settings:
map_merge:
- get_attr: [NeutronBase, role_data, service_config_settings]

View File

@ -0,0 +1,6 @@
---
other:
- |
Add "radvd_user" configuration parameter to the Neutron L3 container.
This parameter defines the user pased to radvd. The default value is
"root".