summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-25 04:23:32 +0000
committerGerrit Code Review <review@openstack.org>2014-08-25 04:23:32 +0000
commit316a89f0b4cf9c7b21771947deb5e7ad7bf39453 (patch)
tree512f8928ef90bcce9700fad7476ddf213380c655
parentaea200427d55b49da3bb4ab3622795f06fe467e5 (diff)
parent65bad0e7370fab02abb55817bde8040e74f85d80 (diff)
Merge "Set vnc to use controller virtual_ip"
-rw-r--r--nova-compute-config.yaml1
-rw-r--r--nova-compute-instance.yaml3
-rw-r--r--overcloud-source.yaml1
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 00658ff2..f8b5ebee 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:
@@ -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}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 7ea23e21..6b172e77 100644
--- a/overcloud-source.yaml
+++ b/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:
- ''