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 /network | |
| 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 'network')
| -rw-r--r-- | network/service_net_map.yaml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/network/service_net_map.yaml b/network/service_net_map.yaml index 4cfff402..5d3f087d 100644 --- a/network/service_net_map.yaml +++ b/network/service_net_map.yaml @@ -33,7 +33,7 @@ parameters: NovaApiNetwork: internal_api NovaMetadataNetwork: internal_api NovaVncProxyNetwork: internal_api - SwiftMgmtNetwork: storage_mgmt + SwiftStorageNetwork: storage_mgmt SwiftProxyNetwork: storage SaharaApiNetwork: internal_api HorizonNetwork: internal_api @@ -61,6 +61,7 @@ parameters: MongoDbNetwork: MongodbNetwork RabbitMqNetwork: RabbitmqNetwork CephPublicNetwork: CephMonNetwork + SwiftMgmtNetwork: SwiftStorageNetwork description: Mapping older deprecated service names, intended for internal use only, this will be removed in future. type: json |