Merge "Pass Horizon port through to controller nodes"

[apex-tripleo-heat-templates.git] / nova-compute-instance.yaml

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 2d8168a..639d971 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:
@@ -153,8 +151,6 @@ parameters:
   NovaComputeLibvirtType:
     type: string
     default: ''
-  NovaDSN:
-    type: string
   NovaImage:
     type: string
     default: overcloud-compute
@@ -211,7 +207,6 @@ resources:
       input_values:
         nova_compute_driver: {get_param: NovaComputeDriver}
         nova_compute_libvirt_type: {get_param: NovaComputeLibvirtType}
-        nova_dsn: {get_param: NovaDSN}
         nova_public_ip: {get_param: NovaPublicIP}
         nova_api_host: {get_param: NovaApiHost}
         nova_password: {get_param: NovaPassword}
@@ -227,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}