From 7ded3131bda05989e35a06c06b8a51f8f324e344 Mon Sep 17 00:00:00 2001 From: Allison Randal Date: Wed, 19 Mar 2014 08:00:33 -0700 Subject: Pass undercloud metadata to overcloud compute 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 --- nova-compute-instance.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'nova-compute-instance.yaml') diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index d2ca90f5..81217362 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -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} -- cgit 1.2.3-korg