diff options
| author |   Ryan Moore <ryan.moore@hp.com> | 2014-06-20 15:23:27 +0100 |
|---|---|---|
| committer | Ryan Moore <ryan.moore@hp.com> | 2014-08-22 10:03:22 +0100 |
| commit | 65bad0e7370fab02abb55817bde8040e74f85d80 (patch) | |
| tree | 9f6de3c9c0c7fc0d0a4f3dc27da38dfff0e4768b | |
| parent | bf5fcb4f73d2de2dbaecfbca07095c5909000dcb (diff) | |
Set vnc to use controller virtual_ip
The address for the vnc proxy is incorrectly configured in the nova
configuration file.
The correct IP address is the Public Virtual IP address of the
controller node as created by:
I9649ee74ebaf62b6b929b28243a07c789a08867c
The nova image_element nova.conf already has:
novncproxy_base_url=http://{{nova.public_ip}}:6080/vnc_auto.html
but nothing was setting nova.public_ip - until now
Closes-Bug: #1332554
Change-Id: I41214834511680170393dd4325b510f549373141
| -rw-r--r-- | nova-compute-config.yaml | 1 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 3 | ||||
| -rw-r--r-- | overcloud-source.yaml | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml index cb428ea6..90387d79 100644 --- a/nova-compute-config.yaml +++ b/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} diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 86115293..318a545c 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -136,6 +136,8 @@ parameters: type: string NovaDSN: type: string + NovaPublicIP: + type: string NeutronDSN: type: string NeutronBridgeMappings: @@ -194,6 +196,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} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index bca88cc6..09d2f51f 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -328,6 +328,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: - '' |