From 4f739cd7931ffa4448ffc2fa9f4af7ac52f3e492 Mon Sep 17 00:00:00 2001 From: marios Date: Thu, 25 Feb 2016 15:48:43 +0100 Subject: Fixup swift device string to delimit the ipv6 address with [] The swift device string is formatted in the outputs of the controller template and swift-storage templates. For ipv6 we need to delimit the address with [] as discussed in https://bugzilla.redhat.com/show_bug.cgi?id=1296701#c0 Change-Id: Ie611d62c3668a65a7be52777a613d265682c6a8b Co-Authored-By: Jiri Stransky Closes-Bug: 1534135 --- puppet/controller.yaml | 4 ++-- puppet/swift-storage.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'puppet') diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 733a9d72..35d4c6b5 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -1762,14 +1762,14 @@ outputs: str_replace: template: 'r1z1-IP:%PORT%/d1' params: - IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} + IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} swift_proxy_memcache: description: Swift proxy-memcache value value: str_replace: template: "IP:11211" params: - IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]} + IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]} config_identifier: description: identifier which changes if the controller configuration may need re-applying value: diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml index 15a5474d..3b04be83 100644 --- a/puppet/swift-storage.yaml +++ b/puppet/swift-storage.yaml @@ -373,7 +373,7 @@ outputs: str_replace: template: 'r1z1-IP:%PORT%/d1' params: - IP: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} + IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]} external_ip_address: description: IP address of the server in the external network value: {get_attr: [ExternalPort, ip_address]} -- cgit 1.2.3-korg