openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix Ironic templates

Browse Source 
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
This commit is contained in:
Robert Collins
2014-03-24 17:23:40 +13:00
parent 7ded3131bd
commit 2817287d36
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -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 $@