diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-12-23 17:30:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-12-23 17:30:45 +0000 |
| commit | 733339df912c2d8a488c2e823c83904febed8581 (patch) | |
| tree | 988996ad0fed64b57b95f91bf3328d895a4702f8 | |
| parent | 26c80ee53dfe2b8e6baa149a4a9be3f1222aade7 (diff) | |
| parent | 2c403d89fa3af67c36ff0e37f9dfafbf7dc5103f (diff) | |
Merge "Don't store Neutron DB credentials on compute node"
| -rw-r--r-- | compute.yaml | 3 | ||||
| -rw-r--r-- | nova-compute-config.yaml | 1 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 3 | ||||
| -rw-r--r-- | overcloud-source.yaml | 6 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 6 |
5 files changed, 0 insertions, 19 deletions
diff --git a/compute.yaml b/compute.yaml index 82698751..c0a69afe 100644 --- a/compute.yaml +++ b/compute.yaml @@ -113,8 +113,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" @@ -285,7 +283,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} diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index b3ef6000..2d8168c0 100644 --- a/nova-compute-config.yaml +++ b/nova-compute-config.yaml @@ -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} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 9a9f40db..639d971e 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -93,8 +93,6 @@ parameters: type: string NeutronBridgeMappings: type: string - NeutronDSN: - type: string NeutronEnableTunnelling: type: string NeutronFlatNetworks: @@ -224,7 +222,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} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index ba41bcb8..ee759ea7 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -425,12 +425,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: diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index a9f49719..803a5016 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -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 |