diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-08-24 21:43:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-08-24 21:43:58 +0000 |
commit | 5d13a6397c4dccc78dc13c4bf23d651485868904 (patch) | |
tree | 0cb9792a426f118df31775fe7a6f117bdacf1b1c /puppet/controller.yaml | |
parent | fbe9ec9405ad670da3ab21533aa29743388ee243 (diff) | |
parent | b542ce77775631bd0f7621a9a4decfdbc42ff891 (diff) |
Merge "Permit usage of raw disks as backends for Swift storage"
Diffstat (limited to 'puppet/controller.yaml')
-rw-r--r-- | puppet/controller.yaml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index e46e4062..a9e0c18e 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -171,6 +171,10 @@ parameters: in the ring. hidden: true type: string + SwiftRawDisks: + default: {} + description: 'A hash of additional raw devices to use as Swift backend (eg. {sdb: {}})' + type: json UpgradeLevelNovaCompute: type: string description: Nova Compute upgrade level @@ -749,7 +753,14 @@ outputs: description: Swift device formatted for swift-ring-builder value: str_replace: - template: 'r1z1-IP:%PORT%/d1' + template: + list_join: + - ',' + - ['r1z1-IP:%PORT%/d1'] + - repeat: + template: 'r1z1-IP:%PORT%/DEVICE' + for_each: + DEVICE: {get_param: SwiftRawDisks} params: IP: get_attr: |