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 /Makefile | |
| 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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 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 $@ |