summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--ironic-source.yaml14
-rw-r--r--nova-compute-instance.yaml28
-rw-r--r--overcloud-source.yaml21
-rw-r--r--undercloud-vm-ironic-source.yaml15
5 files changed, 65 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index d27bcf57..511ecb8a 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tusk
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
-undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml
+undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
diff --git a/ironic-source.yaml b/ironic-source.yaml
deleted file mode 100644
index 6782225e..00000000
--- a/ironic-source.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: 'Ironic: Bare Metal provisioning, API and Conductor services.'
-Parameters:
- IronicPassword:
- Type: String
- Description: Ironic password for keystone access
- NoEcho: true
-Resources:
- ironic:
- Type: AWS::AutoScaling::LaunchConfiguration
- Metadata:
- OpenStack::Role: undercloudConfig
- ironic:
- db: mysql://ironic:unset@localhost/ironic
- service-password: {Ref: IronicPassword}
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
diff --git a/undercloud-vm-ironic-source.yaml b/undercloud-vm-ironic-source.yaml
index 9673bb51..2e9555ae 100644
--- a/undercloud-vm-ironic-source.yaml
+++ b/undercloud-vm-ironic-source.yaml
@@ -1,15 +1,30 @@
Parameters:
+ IronicPassword:
+ Type: String
+ Description: Ironic password for keystone access
+ NoEcho: true
NeutronPublicInterface:
Default: eth0
Description: What interface to bridge onto br-ex for network nodes.
Type: String
+ PowerSSHPrivateKey:
+ Description: Private key for using to ssh to a virtual power host.
+ Type: String
+ NoEcho: true
Resources:
undercloudConfig:
Type: AWS::AutoScaling::LaunchConfiguration
Metadata:
+ ironic:
+ db: mysql://ironic:unset@localhost/ironic
+ service-password:
+ Ref: IronicPassword
+ virtual_power_ssh_key:
+ Ref: PowerSSHPrivateKey
nova:
compute_hostname: undercloud
compute_driver: ironic.nova.virt.ironic.driver.IronicDriver
+ compute_manager: ironic.nova.compute.manager.ClusteredComputeManager
db: mysql://nova:unset@localhost/nova
default_ephemeral_format: ext4
host: 127.0.0.1