summaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-19 20:25:17 +0000
committerGerrit Code Review <review@openstack.org>2014-11-19 20:25:17 +0000
commit47b452dd0d81b7cf35cf29fc21dee94d335de789 (patch)
tree0e7d86153dc1c3f0f372ad46d3f4632608755eaf /overcloud-resource-registry.yaml
parent6f816b14a3956a420ef934a74bfc1141e1b9dd76 (diff)
parenteaa52183af833d286d7e5c2f1b58be3df346d2de (diff)
Merge "Split out Nova software config"
Diffstat (limited to 'overcloud-resource-registry.yaml')
-rw-r--r--overcloud-resource-registry.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index 822d9873..4ac404ee 100644
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -1,5 +1,7 @@
resource_registry:
OS::TripleO::BlockStorage: cinder-storage.yaml
OS::TripleO::Compute: compute.yaml
+ OS::TripleO::Compute::SoftwareConfig: compute-config.yaml
+ OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
OS::TripleO::Controller: controller.yaml
OS::TripleO::ObjectStorage: swift-storage.yaml