summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2014-01-17 14:17:00 +1300
committerRobert Collins <rbtcollins@hp.com>2014-01-17 14:18:53 +1300
commite5d4ce3c5f1ff04e1d0910508fa3cf101893d3e6 (patch)
treeca8a274186395b9fed611ae0e11c27eb82a941d0 /Makefile
parent9e75c7e46022db0b6d9370701883e63ae455b759 (diff)
Add SSL configuration metadata for overclouds.
This passes SSL keys in via Heat which places a high cost on heat compromises or the use of a non-SSL heat to do deploys. We'll want to ensure that that is documented clearly. Change-Id: I14d441460116fda91fbd1d2097c5598b57155a6d
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a11a1089..6d5c8b73 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ overcloud_source_deps = nova-compute-instance.yaml
all: $(generated_templates)
-overcloud.yaml: overcloud-source.yaml swift-source.yaml $(overcloud_source_deps)
- python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml > $@.tmp
+overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
+ python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml ssl-source.yaml > $@.tmp
mv $@.tmp $@
undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-source.yaml