Map Swift services to isolated networks

This change adds paramters to specify which networks the Swift API
services will use. If the storage network exists, it will be used
for the Swift API, otherwise the Undercloud 'ctlplane' network will
be used. If the storage_mgmt network exists, it will be used for
the back-end storage services, otherwise the 'ctlplane' will be
used by default.

Change-Id: I1d5e966a16416c52935c22efe2d4783cd2192c32

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index e2a778b..928ae3c 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -80,3 +80,5 @@ parameter_defaults:
     HeatApiCloudwatchNetwork: internal_api
     NovaApiNetwork: internal_api
     NovaMetadataNetwork: internal_api
+    SwiftMgmtNetwork: storage_mgmt
+    SwiftProxyNetwork: storage

diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 2a1731d..cc570b2 100644 (file)
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -712,10 +712,10 @@ resources:
                 hacluster_pwd: {get_input: pcsd_password}
 
                 # Swift
-                swift::proxy::proxy_local_net_ip: {get_input: controller_host}
+                swift::proxy::proxy_local_net_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
                 swift::proxy::authtoken::auth_uri: {get_input: keystone_auth_uri}
                 swift::proxy::authtoken::identity_uri: {get_input: keystone_identity_uri}
-                swift::storage::all::storage_local_net_ip: {get_input: controller_host}
+                swift::storage::all::storage_local_net_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
                 swift::swift_hash_suffix: {get_input: swift_hash_suffix}
                 swift::proxy::authtoken::admin_password: {get_input: swift_password}
                 tripleo::ringbuilder::part_power: {get_input: swift_part_power}