aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRichard Su <rwsu@redhat.com>2014-03-05 14:58:22 -0800
committerGerrit Code Review <review@openstack.org>2014-03-10 22:00:42 +0000
commit30301f322f91d9e9e786106d8fe6b270600f8672 (patch)
tree4749cc9e8fd3aea2488a89b78bc1a8b481db3a40 /Makefile
parenta2602039fc66891bb9d08dbd5963c9968e1a8ee8 (diff)
Swift storage heat templates
Updated the existing swift-source template to properly list all swift devices. Created a new swift-storage-source template to add additional swift-storage only nodes. The default SWIFTSTORAGESCALE is 0. Change this number to add additional swift storage nodes. Change-Id: Ia05f4ad44593316430d60541106d23b032c3e760
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 93ff852d..d3424e49 100644
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@ overcloud_source_deps = nova-compute-instance.yaml
all: $(generated_templates)
-overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
- python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp
+overcloud.yaml: overcloud-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml $(overcloud_source_deps)
+ python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE='0'} overcloud-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml > $@.tmp
mv $@.tmp $@
overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml