diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-02-24 21:12:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-02-24 21:12:50 +0000 |
| commit | 7261951737022d794298bea7f561e4efab1e5f66 (patch) | |
| tree | 20cbd8abd6aa3de275dc2b6301144400e6b48169 /Makefile | |
| parent | 62ab434139c4576afe84b7b0b08374261fc79563 (diff) | |
| parent | c82b6cec10e1b411774d2f4d5d51565ba7c3550c (diff) | |
Merge "Deprecate the old mergepy overcloud templates"
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 |