summaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.yaml
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 /nova-compute-instance.yaml
parentaea200427d55b49da3bb4ab3622795f06fe467e5 (diff)
parent65bad0e7370fab02abb55817bde8040e74f85d80 (diff)
Merge "Set vnc to use controller virtual_ip"
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml3
1 files changed, 3 insertions, 0 deletions
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}