From d0236047270924dec7a63863ff4c2af9cff1aa1a Mon Sep 17 00:00:00 2001 From: Ryan Brady Date: Wed, 8 Jan 2014 09:06:32 -0500 Subject: 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 --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b05f951a..8ffc8b86 100644 --- a/Makefile +++ b/Makefile @@ -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 $@ -- cgit 1.2.3-korg