diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-01-17 09:20:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-01-17 09:20:43 +0000 |
| commit | 6200c9f4847e2823ff91880888aba485461f3242 (patch) | |
| tree | cd866ba623d751af962504851c866f28909bc358 /Makefile | |
| parent | 9e75c7e46022db0b6d9370701883e63ae455b759 (diff) | |
| parent | d0236047270924dec7a63863ff4c2af9cff1aa1a (diff) | |
Merge "Add optional cinder storage node to overcloud"
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -14,6 +14,12 @@ overcloud.yaml: overcloud-source.yaml swift-source.yaml $(overcloud_source_deps) python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp mv $@.tmp $@ +overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml + # $^ won't work here because we want to list nova-compute-instance.yaml as + # a prerequisite but don't want to pass it into merge.py + python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml block-storage.yaml > $@.tmp + mv $@.tmp $@ + undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml python ./tripleo_heat_merge/merge.py $^ > $@.tmp mv $@.tmp $@ |