diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-07 09:20:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-07 09:20:53 +0000 |
| commit | c97e6aa0b85d19d38144318c97a55babd260cf70 (patch) | |
| tree | b85ded9375ecdb06cc743c2a1b1c0e713790b7f7 | |
| parent | 63bc11d37148b696cbb44784abeebf725778453e (diff) | |
| parent | 4f739cd7931ffa4448ffc2fa9f4af7ac52f3e492 (diff) | |
Merge "Fixup swift device string to delimit the ipv6 address with []"
| -rw-r--r-- | puppet/controller.yaml | 4 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
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]} |