diff options
| author |   Allison Randal <allison@lohutok.net> | 2014-03-19 08:00:33 -0700 |
|---|---|---|
| committer | Allison Randal <allison@lohutok.net> | 2014-03-21 17:14:38 -0700 |
| commit | 7ded3131bda05989e35a06c06b8a51f8f324e344 (patch) | |
| tree | 45ff951ebf0ac514ed7e62bc4c69bad0ba2499d0 | |
| parent | b8ba27916819e3e805c76be69f251a04be227e29 (diff) | |
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
| -rw-r--r-- | nova-compute-instance.yaml | 28 | ||||
| -rw-r--r-- | overcloud-source.yaml | 21 |
2 files changed, 49 insertions, 0 deletions
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} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 90543bbe..bba161e1 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -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 |