91e763f748
Proper VLAN support requires adding the IP address to a new device, rather than br-ex/br-ctlplane. This is added in the tripleo-image-elements change https://review.openstack.org/103449 (I3f77f72ac623792e844dbb4d501b6ab269141f8e) and here we just expose it with appropriate glue to get the IP address from Neutron. With this we can now describe a VLAN public interface scenario to the undercloud and overcloud control planes. Change-Id: I4d2194fc813aebb0708d6fddf4f05bae5f091fd8
55 lines
2.8 KiB
Makefile
55 lines
2.8 KiB
Makefile
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
|
|
|
|
all: $(generated_templates)
|
|
VALIDATE := $(patsubst %,validate-%,$(generated_templates))
|
|
validate-all: $(VALIDATE)
|
|
$(VALIDATE):
|
|
heat template-validate -f $(subst validate-,,$@)
|
|
|
|
# set CONTROLEXTRA to overcloud-vlan-port.yaml to activate the VLAN
|
|
# auto-assignment from Neutron.
|
|
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
|
|
mv $@.tmp $@
|
|
|
|
overcloud-with-block-storage-nfs.yaml: overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml $(overcloud_source_deps)
|
|
# $^ 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 --hot --scale NovaCompute=$${COMPUTESCALE:-'1'} --scale controller=$${CONTROLSCALE:-'1'} --scale SwiftStorage=$${SWIFTSTORAGESCALE:-'0'} --scale BlockStorage=$${BLOCKSTORAGESCALE:-'1'} overcloud-source.yaml block-storage-nfs.yaml nfs-server-source.yaml swift-source.yaml swift-storage-source.yaml ssl-source.yaml > $@.tmp
|
|
mv $@.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-nova-config.yaml 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
|
|
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
|
|
python ./tripleo_heat_merge/merge.py --hot $^ > $@.tmp
|
|
mv $@.tmp $@
|
|
|
|
check: test
|
|
|
|
test:
|
|
@bash test_merge.bash
|
|
|
|
clean:
|
|
rm -f $(generated_templates)
|
|
|
|
.PHONY: clean overcloud.yaml check
|