Merge "Pass Horizon port through to controller nodes"

[apex-tripleo-heat-templates.git] / overcloud-source.yaml

diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index ba41bcb..d62a093 100644 (file)
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -116,6 +116,10 @@ parameters:
     description: The filepath of the file to use for logging messages from Glance.
     type: string
     default: ''
+  HorizonPort:
+    type: number
+    default: 80
+    description: Horizon web server port.
   GlancePassword:
     default: unset
     description: The password for the glance service account, used by the glance services.
@@ -425,12 +429,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:
@@ -577,6 +575,7 @@ resources:
           metadata_server_url: {get_input: heat.metadata_server_url}
           waitcondition_server_url: {get_input: heat.waitcondition_server_url}
         horizon:
+          port: {get_param: HorizonPort}
           caches:
             memcached:
               nodes: