Remove deprecated net_ip_uri_map output

Takes the net_ip_uri_map value from the *_uri values emitted
by net_ip_map instead.

Also removes TenantIp and TenantIpUri from net_vip_map_external
templates as there won't be any VIP on the tenant network.

Change-Id: Icdac3d58162891f5ca3d5c20f14fcdff1781996f

1 files changed, 8 insertions, 2 deletions

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 0654e7d0..f2ea3939 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -264,7 +264,6 @@ resources:
             network:
               mapped_data:
                 net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
-                net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
             object_extraconfig:
               mapped_data: {get_param: ObjectStorageExtraConfig}
             extraconfig:
@@ -390,7 +389,14 @@ outputs:
       str_replace:
         template: 'r1z1-IP:%PORT%/d1'
         params:
-          IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
+          IP:
+            get_attr:
+              - NetIpMap
+              - net_ip_map
+              - str_replace:
+                  template: "NETWORK_uri"
+                  params:
+                    NETWORK: {get_param: [ServiceNetMap, SwiftMgmtNetwork]}
   external_ip_address:
     description: IP address of the server in the external network
     value: {get_attr: [ExternalPort, ip_address]}