aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2014-10-28 18:00:40 -0400
committerDan Prince <dprince@redhat.com>2015-01-05 13:53:28 -0500
commitf567ba6dea9ef6147ba9214606f9a4d434e99eb1 (patch)
tree1eb958eb165b89a5a66fffe6606ef616189fc794 /overcloud-resource-registry.yaml
parent6812f6f644914da6d4b1c62230517cdd29b1e5f9 (diff)
Controller: Split out software config
This is a step towards supporting pluggable software configurations in the heat templates. By moving controller-config out of controller.yaml we make it possible to define alternate implementations by changing the OS::TripleO::ControllerConfig value in the overcloud-resource-registry.yaml heat environment file. Change-Id: I228216a0b55ff2d384b281d9ad2a61b93d58dab9
Diffstat (limited to 'overcloud-resource-registry.yaml')
-rw-r--r--overcloud-resource-registry.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/overcloud-resource-registry.yaml b/overcloud-resource-registry.yaml
index 476758b0..09a3363b 100644
--- a/overcloud-resource-registry.yaml
+++ b/overcloud-resource-registry.yaml
@@ -5,4 +5,5 @@ resource_registry:
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
OS::TripleO::Net::SoftwareConfig: net-config-noop.yaml
OS::TripleO::Controller: controller.yaml
+ OS::TripleO::Controller::SoftwareConfig: controller-config.yaml
OS::TripleO::ObjectStorage: swift-storage.yaml