openstack/tripleo-heat-templates
Code Issues Proposed changes

Pass undercloud metadata to overcloud compute

Browse Source 
Capture some undercloud metadata into the overcloud compute
configs, so the overcloud nodes can pull updated images from
the undercloud glance. Unset by default, but able to be set
during stack-create or stack-update.

Change-Id: I2997d23c584055c40034827e9beb58e6542ea11c
This commit is contained in:
Allison Randal 2014-03-19 08:00:33 -07:00
parent b8ba279168
commit 7ded3131bd
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
nova-compute-instance.yaml
View File

@ -92,6 +92,27 @@ Parameters:
Default: ''
Description: Static content to append to /etc/hosts
Type: String
LiveUpdateUserName:
Type: String
Description: The live-update username for the undercloud Glance API.
Default: ''
LiveUpdateTenantName:
Type: String
Description: The live-update tenant name for the undercloud Glance API.
Default: ''
LiveUpdateHost:
Type: String
Description: The IP address for the undercloud Glance API.
Default: ''
LiveUpdatePassword:
Type: String
Default: ''
Description: The live-update password for the undercloud Glance API.
NoEcho: true
LiveUpdateComputeImage:
Type: String
Description: The image ID for live-updates to the overcloud compute nodes.
Default: ''
Resources:
ComputeAccessPolicy:
Type: OS::Heat::AccessPolicy
@ -193,3 +214,10 @@ Resources:
host: {Ref: RabbitHost}
username: {Ref: RabbitUserName}
password: {Ref: RabbitPassword}
live-update:
host: {Ref: LiveUpdateHost}
username: {Ref: LiveUpdateUserName}
password: {Ref: LiveUpdatePassword}
tenant-name: {Ref: LiveUpdateTenantName}
base_image_id: {Ref: NovaImage}
live_update_image_id: {Ref: LiveUpdateComputeImage}

21
overcloud-source.yaml
View File

@ -145,6 +145,27 @@ Parameters:
Type: String
Default: ''
NoEcho: true
LiveUpdateUserName:
Type: String
Description: The live-update username for the undercloud Glance API.
Default: ''
LiveUpdateTenantName:
Type: String
Description: The live-update tenant name for the undercloud Glance API.
Default: ''
LiveUpdateHost:
Type: String
Description: The IP address for the undercloud Glance API.
Default: ''
LiveUpdatePassword:
Type: String
Default: ''
Description: The live-update password for the undercloud Glance API.
NoEcho: true
LiveUpdateComputeImage:
Type: String
Description: The image ID for live-updates to the overcloud compute nodes.
Default: ''
Resources:
RabbitCookie:
Type: OS::Heat::RandomString