diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-09-01 19:24:05 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-09-08 20:19:37 +0000 |
| commit | bedf3dc546982624628267f812bae24d9b73ff44 (patch) | |
| tree | b27d7ad3ba85b420cda35d2fed85c1e3c072868a /puppet/services/swift-storage.yaml | |
| parent | 158636bf93ce00fac66f62a99ac746fe9e94504f (diff) | |
Convert SwiftDevicesAndProxyConfig to composable format
Make use of the new composable per-service node_ips lists by
adding a ServiceNetMap entry for SwiftStorage, then
pass the data to construct the raw device list into puppet-tripleo
instead of mangling it in t-h-t inside the role templates.
This will allow running swift storage services on nodes other than
the Controller and ObjectStorage roles, and is required to enable
custom roles.
Depends-On: I11deed1df712ecccf85d36a75b3bd2e9d226af36
Change-Id: I1bf5f8a9d34b1a5d64ab8656b386226b54ec1a27
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'puppet/services/swift-storage.yaml')
| -rw-r--r-- | puppet/services/swift-storage.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml index 91d52569..7fbb8d90 100644 --- a/puppet/services/swift-storage.yaml +++ b/puppet/services/swift-storage.yaml @@ -87,6 +87,6 @@ outputs: - healthcheck - account-server swift::storage::disks: {get_param: SwiftRawDisks} - swift::storage::all::storage_local_net_ip: {get_param: [ServiceNetMap, SwiftMgmtNetwork]} + swift::storage::all::storage_local_net_ip: {get_param: [ServiceNetMap, SwiftStorageNetwork]} step_config: | include ::tripleo::profile::base::swift::storage |