diff options
| author |   Christian Schwede <cschwede@redhat.com> | 2017-06-08 20:13:56 +0200 |
|---|---|---|
| committer | Christian Schwede <cschwede@redhat.com> | 2017-06-12 11:08:28 +0200 |
| commit | 2d5f751ecb3be47380ab4c2e63fe0d8da0ccf39a (patch) | |
| tree | d4a9c28a656a0dcfa42bbe11cf057118ea47ef34 /docker/services | |
| parent | 5781c925f4844debba81834d100815fcb84ad8e8 (diff) | |
Execute Swift ring up-/download in containerized environments
This patch ensures that Swift rings are downloaded from the undercloud
before a rebalance and uploaded afterwards.
Depends-On: I51c5795b9893d797bd73e059910f17a98f04cdbe
Change-Id: Ief012fed628957e4da63ff3314c4cf01d58b6b16
Diffstat (limited to 'docker/services')
| -rw-r--r-- | docker/services/swift-ringbuilder.yaml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml index bfd445d0..075d8d7c 100644 --- a/docker/services/swift-ringbuilder.yaml +++ b/docker/services/swift-ringbuilder.yaml @@ -58,6 +58,14 @@ parameters: default: true description: 'Use a local directory for Swift storage services when building rings' type: boolean + SwiftRingGetTempurl: + default: '' + description: A temporary Swift URL to download rings from. + type: string + SwiftRingPutTempurl: + default: '' + description: A temporary Swift URL to upload rings to. + type: string resources: @@ -75,14 +83,17 @@ outputs: description: Role data for Swift Ringbuilder configuration in containers. value: service_name: {get_attr: [SwiftRingbuilderBase, role_data, service_name]} - config_settings: {get_attr: [SwiftRingbuilderBase, role_data, config_settings]} + config_settings: + map_merge: + - {get_attr: [SwiftRingbuilderBase, role_data, config_settings]} + - tripleo::profile::base::swift::ringbuilder:skip_consistency_check: true step_config: &step_config get_attr: [SwiftRingbuilderBase, role_data, step_config] service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: config_volume: 'swift' - puppet_tags: exec,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance + puppet_tags: exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball step_config: *step_config config_image: list_join: |