diff options
| author |   Dan Prince <dprince@redhat.com> | 2015-02-23 14:22:12 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2015-02-23 20:50:59 -0500 |
| commit | c82b6cec10e1b411774d2f4d5d51565ba7c3550c (patch) | |
| tree | e80a999cba61fb0d75fc847c031a112195b236d2 /Makefile | |
| parent | 112a42f34d4384eab729f039ad60b88cc714d09b (diff) | |
Deprecate the old mergepy overcloud templates
This patch moves all the related mergepy templates for the
overcloud into a deprecated directory. The Makefile has
been updated so that overcloud.yaml is still generated
at the top level so this shouldn't break end users.
This is to reduce confusion for new users who are learning the
TripleO heat templates and find the fact that we have two full
implementations very confusing.
Change-Id: I0848aca4dee3e37cb4c6089c5f655ad22ac6c5fd
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -6,8 +6,8 @@ generated_templates = \ undercloud-vm-ironic.yaml \ undercloud-vm-ironic-vlan.yaml -# Files included in overcloud-source.yaml via FileInclude -overcloud_source_deps = nova-compute-instance.yaml +# Files included in deprecated/overcloud-source.yaml via FileInclude +overcloud_source_deps = deprecated/nova-compute-instance.yaml all: $(generated_templates) VALIDATE := $(patsubst %,validate-%,$(generated_templates)) @@ -18,8 +18,8 @@ $(VALIDATE): # You can define in CONTROLEXTRA one or more additional YAML files to further extend the template, some additions could be: # - overcloud-vlan-port.yaml to activate the VLAN auto-assignment from Neutron # - nfs-source.yaml to configure Cinder with NFS -overcloud.yaml: overcloud-source.yaml block-storage.yaml swift-deploy.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml nova-compute-config.yaml $(overcloud_source_deps) - python ./tripleo_heat_merge/merge.py --hot --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE:-'0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'0'} --scale CephStorage=$${CEPHSTORAGESCALE:-'0'} overcloud-source.yaml block-storage.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml swift-deploy.yaml nova-compute-config.yaml ${CONTROLEXTRA} > $@.tmp +overcloud.yaml: deprecated/overcloud-source.yaml deprecated/block-storage.yaml deprecated/swift-deploy.yaml deprecated/swift-source.yaml deprecated/swift-storage-source.yaml deprecated/ssl-source.yaml deprecated/nova-compute-config.yaml $(overcloud_source_deps) + python ./tripleo_heat_merge/merge.py --hot --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE:-'0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'0'} --scale CephStorage=$${CEPHSTORAGESCALE:-'0'} deprecated/overcloud-source.yaml deprecated/block-storage.yaml deprecated/swift-source.yaml deprecated/swift-storage-source.yaml deprecated/ssl-source.yaml deprecated/swift-deploy.yaml deprecated/nova-compute-config.yaml ${CONTROLEXTRA} > $@.tmp mv $@.tmp $@ undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-nova-config.yaml undercloud-vm-nova-deploy.yaml |