diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-27 08:49:36 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-27 08:49:36 +0000 |
commit | 7cd061a8565a068ea29e001a47dd8fbd2a4bce61 (patch) | |
tree | 39f88a6aa5023a467cd5a40198efd85cedd1251b /overcloud.yaml | |
parent | 894453f46e30c45a500bdeeeccc27ac5f1fc362b (diff) | |
parent | ddd2eb9f13b5df416a0f7794b952763bf597cbff (diff) |
Merge "Configure CephStorage services via resource chains"
Diffstat (limited to 'overcloud.yaml')
-rw-r--r-- | overcloud.yaml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 6a42730d..6a8081af 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -733,7 +733,12 @@ parameters: type: json description: Optional scheduler hints to pass to nova default: {} - + CephStorageServices: + default: [] + description: A list of service resources (configured in the Heat + resource_registry) which represent nested stacks + for each service that should get installed on the CephStorage nodes. + type: comma_delimited_list # Hostname format for each role # Note %index% is translated into the index of the node, e.g 0/1/2 etc @@ -1143,6 +1148,13 @@ resources: SchedulerHints: {get_param: ObjectStorageSchedulerHints} NodeIndex: '%index%' + CephStorageServiceChain: + type: OS::TripleO::Services + properties: + Services: {get_param: CephStorageServices} + EndpointMap: {get_attr: [EndpointMap, endpoint_map]} + MysqlVirtualIPUri: {get_attr: [VipMap, net_ip_uri_map, {get_param: [ServiceNetMap, MysqlNetwork]}]} + CephStorage: type: OS::Heat::ResourceGroup depends_on: Networks @@ -1170,6 +1182,7 @@ resources: ServerMetadata: {get_param: ServerMetadata} SchedulerHints: {get_param: CephStorageSchedulerHints} NodeIndex: '%index%' + ServiceConfigSettings: {get_attr: [CephStorageServiceChain, config_settings]} ControllerIpListMap: type: OS::TripleO::Network::Ports::NetIpListMap @@ -1574,6 +1587,7 @@ resources: allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]} cephstorage_config: {get_attr: [CephStorage, attributes, config_identifier]} deployment_identifier: {get_param: DeployIdentifier} + StepConfig: {get_attr: [CephStorageServiceChain, step_config]} outputs: KeystoneURL: |