diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-03-24 17:23:40 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-03-25 14:04:52 +1300 |
| commit | 2817287d36d8ceed637a9dd603067b858f3dde65 (patch) | |
| tree | c0845996b129beb5fe49444fabd5850e45c0b17c | |
| parent | 7ded3131bda05989e35a06c06b8a51f8f324e344 (diff) | |
Fix Ironic templates
The merge of ironic-source wasn't actually merging, leading to bad
templates. As part of this add the needed SSH virtual power key
(because like nova-bm, Ironic requires that for now).
We also need to set the compute_manager for nova with Ironic, so that
gets set too.
Change-Id: I0d7d535dbac3584b3eb12865259ee6403e20c98f
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ironic-source.yaml | 14 | ||||
| -rw-r--r-- | undercloud-vm-ironic-source.yaml | 15 |
3 files changed, 16 insertions, 15 deletions
@@ -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/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 |