openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Set vnc to use controller virtual_ip"

Browse Source
This commit is contained in:
Jenkins 2014-08-25 04:23:32 +00:00 committed by Gerrit Code Review
commit 316a89f0b4
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova-compute-config.yaml
View File

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

3
nova-compute-instance.yaml
View File

@ -136,6 +136,8 @@ parameters:
type: string type: string
NovaDSN: NovaDSN:
type: string type: string
NovaPublicIP:
type: string
NeutronDSN: NeutronDSN:
type: string type: string
NeutronBridgeMappings: NeutronBridgeMappings:
@ -200,6 +202,7 @@ resources:
nova_compute_driver: {get_param: NovaComputeDriver} nova_compute_driver: {get_param: NovaComputeDriver}
nova_compute_libvirt_type: {get_param: NovaComputeLibvirtType} nova_compute_libvirt_type: {get_param: NovaComputeLibvirtType}
nova_dsn: {get_param: NovaDSN} nova_dsn: {get_param: NovaDSN}
nova_public_ip: {get_param: NovaPublicIP}
nova_api_host: {get_param: NovaApiHost} nova_api_host: {get_param: NovaApiHost}
nova_password: {get_param: NovaPassword} nova_password: {get_param: NovaPassword}
ceilometer_dsn: {get_param: CeilometerDSN} ceilometer_dsn: {get_param: CeilometerDSN}

1
overcloud-source.yaml
View File

@ -336,6 +336,7 @@ resources:
- - mysql://nova:unset@ - - mysql://nova:unset@
- &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} - &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
- /nova - /nova
NovaPublicIP: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
CeilometerDSN: CeilometerDSN:
Fn::Join: Fn::Join:
- '' - ''