Merge "Pass Horizon port through to controller nodes"

diff --combined overcloud-source.yaml
index ee759ea,d1f5ce9..d62a093
--- 1/overcloud-source.yaml
--- 2/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@@ -116,6 -116,10 +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.
@@@ -418,13 -422,25 +422,13 @@@ resources
          NeutronHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
          GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
          RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
 -        NovaDSN:
 -          Fn::Join:
 -            - ''
 -            - - mysql://nova:unset@
 -              - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
 -              - /nova
          NovaPublicIP: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
          CeilometerDSN:
            Fn::Join:
              - ''
              - - mysql://ceilometer:unset@
 -              - *compute_database_host
 +              - &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:
@@@ -571,6 -587,7 +575,7 @@@
            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: