summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-27 20:01:53 +0000
committerGerrit Code Review <review@openstack.org>2015-05-27 20:01:53 +0000
commita58431e4c7a94ae9fa9320e628fbf8aff882b183 (patch)
treec6922b7f5992fb7735f5a5e238b817a74eb2a7f4 /puppet
parent4c82514a4d91eeebf4aecd2520d89b3f64d4074b (diff)
parent4e891510e0c42d1cdda430d53ab34b72b903a208 (diff)
Merge "Map Swift services to isolated networks"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller-puppet.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index e3f6bbce..df733027 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -724,10 +724,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}