Removes the NeutronScale resource from controller pcmk manifest

[apex-tripleo-heat-templates.git] / Makefile

diff --git a/Makefile b/Makefile
index 75b8a4a..6ead708 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,41 @@
-generated_templates =                \
-        overcloud.yaml               \
-        undercloud-vm.yaml           \
-        undercloud-bm.yaml           \
-        undercloud-vm-tuskar.yaml    \
-        undercloud-vm-ironic.yaml
+generated_templates =                         \
+        overcloud.yaml                        \
+        overcloud-with-block-storage-nfs.yaml \
+        undercloud-vm.yaml                    \
+        undercloud-bm.yaml                    \
+        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)
-
-overcloud.yaml: overcloud-source.yaml swift-source.yaml ssl-source.yaml $(overcloud_source_deps)
-       python ./tripleo_heat_merge/merge.py --scale NovaCompute=$${COMPUTESCALE:-'1'} 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
-       # $^ won't work here because we want to list nova-compute-instance.yaml as
-       # a prerequisite but don't want to pass it into merge.py
-       python ./tripleo_heat_merge/merge.py overcloud-source.yaml swift-source.yaml block-storage.yaml > $@.tmp
+VALIDATE := $(patsubst %,validate-%,$(generated_templates))
+validate-all: $(VALIDATE)
+$(VALIDATE):
+       heat template-validate -f $(subst 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: 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-source.yaml
-       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+undercloud-vm.yaml: undercloud-source.yaml undercloud-vm-nova-config.yaml undercloud-vm-nova-deploy.yaml
+       python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
        mv $@.tmp $@
 
-undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-source.yaml
-       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+undercloud-bm.yaml: undercloud-source.yaml undercloud-bm-nova-config.yaml undercloud-bm-nova-deploy.yaml
+       python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
        mv $@.tmp $@
 
-undercloud-vm-tuskar.yaml: undercloud-source.yaml undercloud-vm-source.yaml tuskar-source.yaml
-       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml
+       python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
        mv $@.tmp $@
 
-undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.yaml ironic-source.yaml
-       python ./tripleo_heat_merge/merge.py $^ > $@.tmp
+undercloud-vm-ironic-vlan.yaml: undercloud-source.yaml undercloud-vm-ironic-config.yaml undercloud-vm-ironic-deploy.yaml undercloud-vlan-port.yaml
+       python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
        mv $@.tmp $@
 
 check: test