Merge "Add "radvd_user" config parameter to Neutron L3 container" into stable/stein
This commit is contained in:
commit
a74859da0c
|
@ -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]
|
||||
|
|
|
@ -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".
|
Loading…
Reference in New Issue