Don't store Neutron DB credentials on compute node
This patch removes all references to the Neutron DSN parameter in the overcloud compute templates. These credentials are not required in order to run the required Neutron services. Change-Id: I0691f43bd2ce85bec0d68ab979136414f0610c61
This commit is contained in:
parent
dfec68afbe
commit
2c403d89fa
|
@ -114,8 +114,6 @@ parameters:
|
|||
scripts or be sure to keep 'datacentre' as a mapping network name.
|
||||
type: string
|
||||
default: ""
|
||||
NeutronDSN:
|
||||
type: string
|
||||
NeutronEnableTunnelling:
|
||||
type: string
|
||||
default: "True"
|
||||
|
@ -273,7 +271,6 @@ resources:
|
|||
keystone_host: {get_param: KeystoneHost}
|
||||
neutron_flat_networks: {get_param: NeutronFlatNetworks}
|
||||
neutron_host: {get_param: NeutronHost}
|
||||
neutron_dsn: {get_param: NeutronDSN}
|
||||
neutron_local_ip: {get_attr: [NovaCompute, networks, ctlplane, 0]}
|
||||
neutron_tenant_network_type: {get_param: NeutronNetworkType}
|
||||
neutron_tunnel_types: {get_param: NeutronTunnelTypes}
|
||||
|
|
|
@ -35,7 +35,6 @@ resources:
|
|||
host: {get_input: neutron_host}
|
||||
router_distributed: {get_input: neutron_router_distributed}
|
||||
agent_mode: {get_input: neutron_agent_mode}
|
||||
ovs_db: {get_input: neutron_dsn}
|
||||
metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
||||
mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
||||
allow_automatic_l3agent_failover: {get_input: neutron_allow_l3agent_failover}
|
||||
|
|
|
@ -93,8 +93,6 @@ parameters:
|
|||
type: string
|
||||
NeutronBridgeMappings:
|
||||
type: string
|
||||
NeutronDSN:
|
||||
type: string
|
||||
NeutronEnableTunnelling:
|
||||
type: string
|
||||
NeutronFlatNetworks:
|
||||
|
@ -223,7 +221,6 @@ resources:
|
|||
keystone_host: {get_param: KeystoneHost}
|
||||
neutron_flat_networks: {get_param: NeutronFlatNetworks}
|
||||
neutron_host: {get_param: NeutronHost}
|
||||
neutron_dsn: {get_param: NeutronDSN}
|
||||
neutron_local_ip: {get_attr: [NovaCompute0, networks, ctlplane, 0]}
|
||||
neutron_tenant_network_type: {get_param: NeutronNetworkType}
|
||||
neutron_tunnel_types: {get_param: NeutronTunnelTypes}
|
||||
|
|
|
@ -427,12 +427,6 @@ resources:
|
|||
- - mysql://ceilometer:unset@
|
||||
- &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
||||
- /ceilometer
|
||||
NeutronDSN:
|
||||
Fn::Join:
|
||||
- ''
|
||||
- - mysql://neutron:unset@
|
||||
- *compute_database_host
|
||||
- /ovs_neutron
|
||||
NeutronNetworkType:
|
||||
get_param: NeutronNetworkType
|
||||
NeutronTunnelTypes:
|
||||
|
|
|
@ -583,12 +583,6 @@ resources:
|
|||
- - mysql://ceilometer:unset@
|
||||
- &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
|
||||
- /ceilometer
|
||||
NeutronDSN:
|
||||
list_join:
|
||||
- ''
|
||||
- - mysql://neutron:unset@
|
||||
- *compute_database_host
|
||||
- /ovs_neutron
|
||||
|
||||
BlockStorage:
|
||||
type: OS::Heat::ResourceGroup
|
||||
|
|
Loading…
Reference in New Issue