diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-31 19:46:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-31 19:46:24 +0000 |
| commit | 6022812597dae8e286d0641d5f1603aeb3735d8f (patch) | |
| tree | 6fe5a7bc91319927dfadc3eb19b9bb11f3cb04b6 /puppet | |
| parent | 7903fc743bd3e445ef48c2d08a4bd3115f825e0b (diff) | |
| parent | be1b311184424c2ae6720b7b61640bc227467d5f (diff) | |
Merge "Configure ObjectStorage services via resource chains"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/services/README.rst | 4 | ||||
| -rw-r--r-- | puppet/swift-storage-post.yaml | 5 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/puppet/services/README.rst b/puppet/services/README.rst index 38d2ac64..15c8c1f1 100644 --- a/puppet/services/README.rst +++ b/puppet/services/README.rst @@ -48,3 +48,7 @@ are re-asserted when applying latter ones. 5) Service activation (Pacemaker) 6) Fencing (Pacemaker) + +Note: Not all roles currently support all steps: + + * ObjectStorage role only supports steps 2, 3 and 4 diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml index 2b652443..1aba2bb4 100644 --- a/puppet/swift-storage-post.yaml +++ b/puppet/swift-storage-post.yaml @@ -11,6 +11,10 @@ parameters: NodeConfigIdentifiers: type: json description: Value which changes if the node configuration may need to be re-applied + StepConfig: + type: string + description: Config manifests that will be used to step through the deployment. + default: '' resources: @@ -42,6 +46,7 @@ resources: - '' - - get_file: manifests/overcloud_object.pp - get_file: manifests/ringbuilder.pp + - {get_param: StepConfig} StorageRingbuilderDeployment_Step2: type: OS::Heat::StructuredDeployments diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index 9a1f2fcd..ed52f928 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -121,6 +121,9 @@ parameters: NodeIndex: type: number default: 0 + ServiceConfigSettings: + type: json + default: {} resources: @@ -257,6 +260,7 @@ resources: - heat_config_%{::deploy_config_name} - object_extraconfig - extraconfig + - service_configs - object - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig - all_nodes # provided by allNodesConfig @@ -265,6 +269,8 @@ resources: - network merge_behavior: deeper datafiles: + service_configs: + mapped_data: {get_param: ServiceConfigSettings} common: raw_data: {get_file: hieradata/common.yaml} network: |