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

diff --git a/compute.yaml b/compute.yaml
index e3f4470..3095a7a 100644 (file)
--- a/compute.yaml
+++ b/compute.yaml
@@ -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}

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index b3ef600..2d8168c 100644 (file)
--- 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 55f3a04..acfed21 100644 (file)
--- 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:
@@ -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}

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 3089659..0a5f5c8 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -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:

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index dd7c263..2de3fd2 100644 (file)
--- 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