From 378783f876e10b88becdcd1eb0d0d24fd45e7a80 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Mon, 11 Nov 2013 20:42:46 +0000 Subject: Add metadata to configure swift o Adds the required swift metadata (in swift-source.yaml). o Sets up glance to use the swift backend on the overcloud. o Sets up glance to use the file backend on the undercloud and seed, i.e. maintain the Status quo. Change-Id: I4a70ffbf9c51f1fea5cfc84d8718d3d30d36b3f2 --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 52d65efb..51e954a7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ -overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml - python merge.py $< > $@.tmp +overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.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 merge.py overcloud-source.yaml swift-source.yaml > $@.tmp mv $@.tmp $@ undercloud-vm-tuskar.yaml: undercloud-vm.yaml tuskar-source.yaml -- cgit 1.2.3-korg