diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-05-24 11:51:56 +0100 |
|---|---|---|
| committer |   Giulio Fidente <gfidente@redhat.com> | 2016-05-31 11:00:31 +0200 |
| commit | be1b311184424c2ae6720b7b61640bc227467d5f (patch) | |
| tree | cdf74cce737066522bad3edfe4edf63965c3245a /overcloud.yaml | |
| parent | e3cc44579c0e632eb72c3ea9f58f2ab2bc27a251 (diff) | |
Configure ObjectStorage services via resource chains
Similar to the https://review.openstack.org/#/c/259568 which added support
for the composable services StepConfig and ServiceConfigSettings parameters
so that the Controller role supports composable services, this adds those
interfaces for the ObjectStorage role.
Note that at this time the ObjectStorage post config only supports steps
2, 3 and 4, not all those in services/README.rst
Partially-Implements: blueprint composable-services-within-roles
Change-Id: I22ffaa68a6ccd4be29d51674871268179bcddcbc
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index c6772ab3..3adfa3e1 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -713,6 +713,14 @@ parameters: type: json description: Optional scheduler hints to pass to nova default: {} + ObjectStorageServices: + 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 ObjectStorage nodes. + Note this role currently only supports steps 2, 3 and 4 configuration. + type: comma_delimited_list + # Ceph storage specific parameters CephStorageCount: @@ -1124,6 +1132,12 @@ resources: SchedulerHints: {get_param: BlockStorageSchedulerHints} NodeIndex: '%index%' + ObjectStorageServiceChain: + type: OS::TripleO::Services + properties: + Services: {get_param: ObjectStorageServices} + EndpointMap: {get_attr: [EndpointMap, endpoint_map]} + ObjectStorage: type: OS::Heat::ResourceGroup depends_on: Networks @@ -1156,6 +1170,7 @@ resources: ServerMetadata: {get_param: ServerMetadata} SchedulerHints: {get_param: ObjectStorageSchedulerHints} NodeIndex: '%index%' + ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, config_settings]} CephStorageServiceChain: type: OS::TripleO::Services @@ -1576,6 +1591,7 @@ resources: allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]} objectstorage_config: {get_attr: [ObjectStorage, attributes, config_identifier]} deployment_identifier: {get_param: DeployIdentifier} + StepConfig: {get_attr: [ObjectStorageServiceChain, step_config]} BlockStorageNodesPostDeployment: type: OS::TripleO::BlockStoragePostDeployment |