Deprecate the undercloud templates.

This patch moves the undercloud templates into the deprecated
directory. The Makefile still builds the resulting templates
at the top level so users should not be broken by this
change.

Change-Id: Ibcb87fe31a6894552a5e445b5495e69fdcc2d382

diff --git a/Makefile b/Makefile
index 6ead708..131e1b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,19 +22,19 @@ overcloud.yaml: deprecated/overcloud-source.yaml deprecated/block-storage.yaml d
        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 $@
 

diff --git a/undercloud-bm-nova-config.yaml b/deprecated/undercloud-bm-nova-config.yaml
similarity index 100%
rename from undercloud-bm-nova-config.yaml
rename to deprecated/undercloud-bm-nova-config.yaml

diff --git a/undercloud-bm-nova-deploy.yaml b/deprecated/undercloud-bm-nova-deploy.yaml
similarity index 100%
rename from undercloud-bm-nova-deploy.yaml
rename to deprecated/undercloud-bm-nova-deploy.yaml

diff --git a/undercloud-source.yaml b/deprecated/undercloud-source.yaml
similarity index 99%
rename from undercloud-source.yaml
rename to deprecated/undercloud-source.yaml
index 6fe2066..317896d 100644 (file)
--- a/undercloud-source.yaml
+++ b/deprecated/undercloud-source.yaml
@@ -1,4 +1,4 @@
-description: All-in-one baremetal OpenStack and all dependencies.
+description: Deprecated. Use instack-undercloud instead. All-in-one baremetal OpenStack and all dependencies.
 heat_template_version: 2013-05-23
 parameters:
   AdminPassword:

diff --git a/undercloud-vlan-port.yaml b/deprecated/undercloud-vlan-port.yaml
similarity index 100%
rename from undercloud-vlan-port.yaml
rename to deprecated/undercloud-vlan-port.yaml

diff --git a/undercloud-vm-ironic-config.yaml b/deprecated/undercloud-vm-ironic-config.yaml
similarity index 100%
rename from undercloud-vm-ironic-config.yaml
rename to deprecated/undercloud-vm-ironic-config.yaml

diff --git a/undercloud-vm-ironic-deploy.yaml b/deprecated/undercloud-vm-ironic-deploy.yaml
similarity index 100%
rename from undercloud-vm-ironic-deploy.yaml
rename to deprecated/undercloud-vm-ironic-deploy.yaml

diff --git a/undercloud-vm-nova-config.yaml b/deprecated/undercloud-vm-nova-config.yaml
similarity index 100%
rename from undercloud-vm-nova-config.yaml
rename to deprecated/undercloud-vm-nova-config.yaml

diff --git a/undercloud-vm-nova-deploy.yaml b/deprecated/undercloud-vm-nova-deploy.yaml
similarity index 100%
rename from undercloud-vm-nova-deploy.yaml
rename to deprecated/undercloud-vm-nova-deploy.yaml