Merge "Deprecate the old mergepy overcloud templates"

11 files changed, 10 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index dd7e5fb3..6ead7082 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,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
diff --git a/block-storage.yaml b/deprecated/block-storage.yaml
index c288044a..c288044a 100644
--- a/block-storage.yaml
+++ b/deprecated/block-storage.yaml
diff --git a/nfs-source.yaml b/deprecated/nfs-source.yaml
index 5d865ea7..5d865ea7 100644
--- a/nfs-source.yaml
+++ b/deprecated/nfs-source.yaml
diff --git a/nova-compute-config.yaml b/deprecated/nova-compute-config.yaml
index 1fe787e3..1fe787e3 100644
--- a/nova-compute-config.yaml
+++ b/deprecated/nova-compute-config.yaml
diff --git a/nova-compute-instance.yaml b/deprecated/nova-compute-instance.yaml
index e68c61f9..e68c61f9 100644
--- a/nova-compute-instance.yaml
+++ b/deprecated/nova-compute-instance.yaml
diff --git a/overcloud-source.yaml b/deprecated/overcloud-source.yaml
index f73206d7..91b6b7fd 100644
--- a/overcloud-source.yaml
+++ b/deprecated/overcloud-source.yaml
@@ -1,5 +1,4 @@
-description: Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
-  server,Dedicated RabbitMQ Server,Group of Nova Computes
+description: Deprecated. Please migrate to use overcloud-without-mergepy instead.
 heat_template_version: 2013-05-23
 parameters:
   AdminPassword:
@@ -416,7 +415,7 @@ resources:
         get_param: RabbitCookieSalt
   NovaCompute0Deployment:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0Deployment
     parameters:
         DefaultSignalTransport:
@@ -456,23 +455,23 @@ resources:
             get_param: NeutronL3HA
   NovaCompute0AllNodesDeployment:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0AllNodesDeployment
     parameters:
         AllNodesConfig: {get_resource: allNodesConfig}
   NovaCompute0:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0
   NovaCompute0Passthrough:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0Passthrough
     parameters:
         passthrough_config: {get_param: ExtraConfig}
   NovaCompute0PassthroughSpecific:
     type: FileInclude
-    Path: nova-compute-instance.yaml
+    Path: deprecated/nova-compute-instance.yaml
     SubKey: resources.NovaCompute0PassthroughSpecific
     parameters:
         passthrough_config_specific: {get_param: NovaComputeExtraConfig}
diff --git a/overcloud-vlan-port.yaml b/deprecated/overcloud-vlan-port.yaml
index 8f6f6937..8f6f6937 100644
--- a/overcloud-vlan-port.yaml
+++ b/deprecated/overcloud-vlan-port.yaml
diff --git a/ssl-source.yaml b/deprecated/ssl-source.yaml
index a9357323..a9357323 100644
--- a/ssl-source.yaml
+++ b/deprecated/ssl-source.yaml
diff --git a/swift-deploy.yaml b/deprecated/swift-deploy.yaml
index d4d32cbd..d4d32cbd 100644
--- a/swift-deploy.yaml
+++ b/deprecated/swift-deploy.yaml
diff --git a/swift-source.yaml b/deprecated/swift-source.yaml
index e6fd951e..e6fd951e 100644
--- a/swift-source.yaml
+++ b/deprecated/swift-source.yaml
diff --git a/swift-storage-source.yaml b/deprecated/swift-storage-source.yaml
index 176925b6..176925b6 100644
--- a/swift-storage-source.yaml
+++ b/deprecated/swift-storage-source.yaml