From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 22 Jan 2014 04:21:37 +0000 (+0000)
Subject: Merge "Add SSL configuration metadata for overclouds."
X-Git-Tag: opnfv-6.0.0~2897
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=01fe17fe1ba0f5d43d14890dc3b7fc0150f67ac8;p=apex-tripleo-heat-templates.git

Merge "Add SSL configuration metadata for overclouds."
---

01fe17fe1ba0f5d43d14890dc3b7fc0150f67ac8
diff --cc Makefile
index 16c780fc,6d5c8b73..d7fc543a
--- a/Makefile
+++ b/Makefile
@@@ -10,16 -10,10 +10,16 @@@ overcloud_source_deps = nova-compute-in
  
  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 $@
  
 +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 $@