b1b66947a0
This patch updates the cinder block storage roles so that they can optionally make use of isolated network ports on the storage, storage management, and internal_api networks. -Multiple networks are created based upon settings in the heat resource registry. These nets will either use the noop network (the control plane pass-thru default) or create a custom Neutron port on each of the configured networks. -The ipaddress/subnet of each network is passed passed into the NetworkConfig resource which drives os-net-config. This allows the deployer to define a custom network template for static IPs, etc on each of the networks. -The ipaddress is exposed as an output parameter. By exposing the individual addresses as outputs we allow Heat to construct collections of ports for various services. Change-Id: I4e18cd4763455f815a8f8b82c93a598c99cc3842 |
||
---|---|---|
deprecated | ||
environments | ||
examples | ||
extraconfig/post_deploy | ||
firstboot | ||
network | ||
puppet | ||
tripleo_heat_merge | ||
.gitignore | ||
.gitreview | ||
LICENSE | ||
MANIFEST.in | ||
Makefile | ||
README.md | ||
all-nodes-config.yaml | ||
babel.cfg | ||
base.yaml | ||
bootstrap-config.yaml | ||
ceph-cluster-config.yaml | ||
ceph-storage-post.yaml | ||
ceph-storage.yaml | ||
cinder-storage-post.yaml | ||
cinder-storage.yaml | ||
compute-post.yaml | ||
compute.yaml | ||
controller-post.yaml | ||
controller.yaml | ||
debian-mirror.yaml | ||
nagios3.yaml | ||
net-config-bond.yaml | ||
net-config-bridge.yaml | ||
net-config-noop.yaml | ||
overcloud-resource-registry-puppet.yaml | ||
overcloud-resource-registry.yaml | ||
overcloud-without-mergepy.yaml | ||
requirements.txt | ||
setup.cfg | ||
setup.py | ||
swift-devices-and-proxy-config.yaml | ||
swift-storage-post.yaml | ||
swift-storage.yaml | ||
test-requirements.txt | ||
test_merge.bash | ||
tox.ini | ||
undercloud-bm-nova-config.yaml | ||
undercloud-bm-nova-deploy.yaml | ||
undercloud-source.yaml | ||
undercloud-vlan-port.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'.