Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Perform basic setup of Pacemaker cluster using puppet-pacemaker"
[apex-tripleo-heat-templates.git]
/
overcloud-resource-registry.yaml
diff --git
a/overcloud-resource-registry.yaml
b/overcloud-resource-registry.yaml
index
9d0f653
..
d4f75e0
100644
(file)
--- a/
overcloud-resource-registry.yaml
+++ b/
overcloud-resource-registry.yaml
@@
-8,6
+8,10
@@
resource_registry:
OS::TripleO::CephStorage: ceph-storage.yaml
OS::TripleO::ControllerPostDeployment: controller-post.yaml
OS::TripleO::ComputePostDeployment: compute-post.yaml
OS::TripleO::CephStorage: ceph-storage.yaml
OS::TripleO::ControllerPostDeployment: controller-post.yaml
OS::TripleO::ComputePostDeployment: compute-post.yaml
+ OS::TripleO::ObjectStoragePostDeployment: swift-storage-post.yaml
+ OS::TripleO::BlockStoragePostDeployment: cinder-storage-post.yaml
+ OS::TripleO::CephStoragePostDeployment: ceph-storage-post.yaml
OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: swift-devices-and-proxy-config.yaml
OS::TripleO::SwiftDevicesAndProxy::SoftwareConfig: swift-devices-and-proxy-config.yaml
+ OS::TripleO::CephClusterConfig::SoftwareConfig: ceph-cluster-config.yaml
OS::TripleO::AllNodes::SoftwareConfig: all-nodes-config.yaml
OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml
OS::TripleO::AllNodes::SoftwareConfig: all-nodes-config.yaml
OS::TripleO::BootstrapNode::SoftwareConfig: bootstrap-config.yaml