diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-01-22 04:21:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-01-22 04:21:37 +0000 |
| commit | 01fe17fe1ba0f5d43d14890dc3b7fc0150f67ac8 (patch) | |
| tree | 85698f58bae6dd4038cad2d200fde44b672609b8 /Makefile | |
| parent | 5569d09be2b1197b3b0a4fea7f8ce197231ee6e7 (diff) | |
| parent | e5d4ce3c5f1ff04e1d0910508fa3cf101893d3e6 (diff) | |
Merge "Add SSL configuration metadata for overclouds."
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 $@ overcloud-with-block-storage.yaml: overcloud-source.yaml nova-compute-instance.yaml swift-source.yaml block-storage.yaml |