Merge "Add SSL configuration metadata for overclouds."

diff --cc Makefile
index 16c780f,6d5c8b7..d7fc543
--- 1/Makefile
--- 2/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 $@