0b306f0037
To use a VLAN based public network we need the ext-net network to be a VLAN with a segmentation id - but we can't do this unless we also have the datacentre physical network marked as allowing vlans. We could make this strictly opt-in, but as this doesn't affect the switch configuration (and thus actual machine capabilities) having it on by default seems reasonable. OTOH we can't force it on, because high security environments may well want a defense in depth setup where neutron admins cannot configure VLANs that they are not meant to have access too (consider that the cloud machine admins may be separate to the folk running the services on top of them...) Change-Id: I9687751753f810896c6d065750910da40132c9fa |
||
|---|---|---|
| examples | ||
| tripleo_heat_merge | ||
| .gitignore | ||
| .gitreview | ||
| LICENSE | ||
| MANIFEST.in | ||
| Makefile | ||
| README.md | ||
| babel.cfg | ||
| base.yaml | ||
| block-storage-nfs.yaml | ||
| block-storage.yaml | ||
| controller.yaml | ||
| debian-mirror.yaml | ||
| nagios3.yaml | ||
| nfs-server-source.yaml | ||
| nova-compute-config.yaml | ||
| nova-compute-instance.yaml | ||
| overcloud-source.yaml | ||
| requirements.txt | ||
| setup.cfg | ||
| setup.py | ||
| ssl-source.yaml | ||
| swift-deploy.yaml | ||
| swift-source.yaml | ||
| swift-storage-source.yaml | ||
| test-requirements.txt | ||
| test_merge.bash | ||
| tox.ini | ||
| undercloud-bm-nova-config.yaml | ||
| undercloud-bm-nova-deploy.yaml | ||
| undercloud-source.yaml | ||
| undercloud-vm-ironic-config.yaml | ||
| undercloud-vm-ironic-deploy.yaml | ||
| undercloud-vm-nova-config.yaml | ||
| undercloud-vm-nova-deploy.yaml | ||
README.md
templates
Generic templates to describe multi-host infrastructure, consumable by OpenStack Heat, Crowbar, others.
merge.py
The Makefile contains several targets for generated templates, see its contents for all of them. To run functional tests for merge.py, run 'make test'.