Merge "Set vnc to use controller virtual_ip"

nova-compute-config.yaml

@@ -9,6 +9,7 @@ resources:
           compute_libvirt_type: { get_input: nova_compute_libvirt_type }
           db: {get_input: nova_dsn}
           host: {get_input: nova_api_host}
+          public_ip: {get_input: nova_public_ip}
           service-password: {get_input: nova_password}
         ceilometer:
           db: {get_input: ceilometer_dsn}

nova-compute-instance.yaml

@@ -136,6 +136,8 @@ parameters:
     type: string
   NovaDSN:
     type: string
+  NovaPublicIP:
+    type: string
   NeutronDSN:
     type: string
   NeutronBridgeMappings:
@@ -200,6 +202,7 @@ resources:
         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}
         ceilometer_dsn: {get_param: CeilometerDSN}

overcloud-source.yaml

@@ -336,6 +336,7 @@ resources:
             - - 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:
             - ''