b529653d31
Passing the key explicitly into nova::compute::rbd means that Puppet will not attempt to fetch the key using `ceph auth get-key <keyring>`, having these effects: * One reason for compute node to have access to the client.admin key is gone (in current implementation it does have access to the key, but this change is a step towards removing it). * Ceph cluster doesn't have to be running at the time when Puppet runs on compute node, meaning we don't have to serialize things more than we do now. Also adding the ComputeCephDeployment as a dependency of ComputePostDeployment, otherwise the hiera file it creates might be created *after* Puppet configuration happens on compute nodes, and the values it provides would be missing during the Puppet run on the compute nodes. Change-Id: Id3166e6d5f01d18ec8a5033398bb511f4321a5e8 Depends-On: I70da06159c0d3c6fa204b5f7a468909ffab4d633 Partial-Bug: #1439949 |
||
---|---|---|
deprecated | ||
examples | ||
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'.