X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=131e1b9eb7b00cab3a446c4055956006a95cb435;hb=daccacc20060c7b166883ae5377dfcc5495a48a5;hp=2db9d45e94ebaf8b4722a274e179b23344470961;hpb=e38535b528e3a611d5fe623b3e0212b88c48395e;p=apex-tripleo-heat-templates.git

diff --git a/Makefile b/Makefile
index 2db9d45e..131e1b9e 100644
--- a/Makefile
+++ b/Makefile
@@ -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,23 +18,23 @@ $(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'} 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
+undercloud-vm.yaml: deprecated/undercloud-source.yaml deprecated/undercloud-vm-nova-config.yaml deprecated/undercloud-vm-nova-deploy.yaml
 	python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
 	mv $@.tmp $@
 
-undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-nova-config.yaml undercloud-bm-nova-deploy.yaml
+undercloud-bm.yaml: deprecated/undercloud-source.yaml deprecated/undercloud-bm-nova-config.yaml deprecated/undercloud-bm-nova-deploy.yaml
 	python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
 	mv $@.tmp $@
 
-undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml
+undercloud-vm-ironic.yaml: deprecated/undercloud-source.yaml deprecated/undercloud-vm-ironic-config.yaml deprecated/undercloud-vm-ironic-deploy.yaml
 	python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
 	mv $@.tmp $@
 
-undercloud-vm-ironic-vlan.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml undercloud-vlan-port.yaml
+undercloud-vm-ironic-vlan.yaml: deprecated/undercloud-source.yaml deprecated/undercloud-vm-ironic-config.yaml deprecated/undercloud-vm-ironic-deploy.yaml deprecated/undercloud-vlan-port.yaml
 	python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
 	mv $@.tmp $@