diff options
author | Ryan Brady <rbrady@redhat.com> | 2014-01-08 09:06:32 -0500 |
---|---|---|
committer | Ryan Brady <rbrady@redhat.com> | 2014-01-15 08:53:24 -0500 |
commit | d0236047270924dec7a63863ff4c2af9cff1aa1a (patch) | |
tree | 4ceff1b2cfdc5e1364a8a0699fd9a3fb20309bc9 /Makefile | |
parent | 5b3593cc0d2b5b51cbfb03041cfb6c3bc05f4381 (diff) |
Add optional cinder storage node to overcloud
Mergeable block storage yaml template. Makefile updated to create a
overcloud-with-block-storage template to deploy an additional machine
as a block storage node.
Change-Id: I37c06cde114592507a4583f7ec53ffac123d66e3
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -4,6 +4,12 @@ overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.ya 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 $@ |