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

8 files changed, 50 insertions, 55 deletions

diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
index 2b98edcc..fcf2eeee 100644
--- a/network/ports/net_ip_map.yaml
+++ b/network/ports/net_ip_map.yaml
@@ -101,16 +101,3 @@ outputs:
       storage_mgmt_uri: {get_param: StorageMgmtIpUri}
       tenant_uri: {get_param: TenantIpUri}
       management_uri: {get_param: ManagementIpUri}
-  # net_ip_uri_map is deprecated, please use *uri from net_ip_map
-  net_ip_uri_map:
-    description: >
-      A Hash containing a mapping of network names to assigned IPs for a
-      specific machine with brackets around IPv6 addresses for use in URLs.
-    value:
-      ctlplane: {get_param: ControlPlaneIp}
-      external: {get_param: ExternalIpUri}
-      internal_api: {get_param: InternalApiIpUri}
-      storage: {get_param: StorageIpUri}
-      storage_mgmt: {get_param: StorageMgmtIpUri}
-      tenant: {get_param: TenantIpUri}
-      management: {get_param: ManagementIpUri}
diff --git a/network/ports/net_vip_map_external.yaml b/network/ports/net_vip_map_external.yaml
index a40a0bfc..71e6e811 100644
--- a/network/ports/net_vip_map_external.yaml
+++ b/network/ports/net_vip_map_external.yaml
@@ -45,12 +45,6 @@ parameters:
   StorageMgmtIpUri:
     default: ''
     type: string
-  TenantIp:
-    default: ''
-    type: string
-  TenantIpUri:
-    default: ''
-    type: string
 
 outputs:
   net_ip_map:
@@ -63,13 +57,8 @@ outputs:
       internal_api: {get_param: InternalApiNetworkVip}
       storage: {get_param: StorageNetworkVip}
       storage_mgmt: {get_param: StorageMgmtNetworkVip}
-  net_ip_uri_map:
-    description: >
-      A Hash containing a mapping of netowrk names to assigned IPs for a
-      specific machine with brackets around IPv6 addresses for use in URLs.
-    value:
-      ctlplane: {get_param: ControlPlaneIP}
-      external: {get_param: ExternalNetworkVip}
-      internal_api: {get_param: InternalApiNetworkVip}
-      storage: {get_param: StorageNetworkVip}
-      storage_mgmt: {get_param: StorageMgmtNetworkVip}
+      ctlplane_uri: {get_param: ControlPlaneIP}
+      external_uri: {get_param: ExternalNetworkVip}
+      internal_api_uri: {get_param: InternalApiNetworkVip}
+      storage_uri: {get_param: StorageNetworkVip}
+      storage_mgmt_uri: {get_param: StorageMgmtNetworkVip}
diff --git a/network/ports/net_vip_map_external_v6.yaml b/network/ports/net_vip_map_external_v6.yaml
index f6d67fe8..8d054349 100644
--- a/network/ports/net_vip_map_external_v6.yaml
+++ b/network/ports/net_vip_map_external_v6.yaml
@@ -45,12 +45,6 @@ parameters:
   StorageMgmtIpUri:
     default: ''
     type: string
-  TenantIp:
-    default: ''
-    type: string
-  TenantIpUri:
-    default: ''
-    type: string
 
 outputs:
   net_ip_map:
@@ -63,31 +57,26 @@ outputs:
       internal_api: {get_param: InternalApiNetworkVip}
       storage: {get_param: StorageNetworkVip}
       storage_mgmt: {get_param: StorageMgmtNetworkVip}
-  net_ip_uri_map:
-    description: >
-      A Hash containing a mapping of netowrk names to assigned IPs for a
-      specific machine with brackets around IPv6 addresses for use in URLs.
-    value:
-      ctlplane: {get_param: ControlPlaneIP}
-      external:
+      ctlplane_uri: {get_param: ControlPlaneIP}
+      external_uri:
         list_join:
           - ''
           - - '['
             - {get_param: ExternalNetworkVip}
             - ']'
-      internal_api:
+      internal_api_uri:
         list_join:
           - ''
           - - '['
             - {get_param: InternalApiNetworkVip}
             - ']'
-      storage:
+      storage_uri:
         list_join:
           - ''
           - - '['
             - {get_param: StorageNetworkVip}
             - ']'
-      storage_mgmt:
+      storage_mgmt_uri:
         list_join:
           - ''
           - - '['
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index f9b9996d..8fa9fd8f 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -284,7 +284,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]}
             ceph_extraconfig:
               mapped_data: {get_param: CephStorageExtraConfig}
             extraconfig:
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index de9a3009..0bde8aca 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -242,7 +242,14 @@ resources:
           str_replace:
             template: "'IP'"
             params:
-              IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
+              IP:
+                get_attr:
+                  - NetIpMap
+                  - net_ip_map
+                  - str_replace:
+                      template: "NETWORK_uri"
+                      params:
+                        NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
         enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
 
@@ -277,7 +284,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]}
             volume_extraconfig:
               mapped_data: {get_param: BlockStorageExtraConfig}
             extraconfig:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index d4414e72..8de9370f 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -392,7 +392,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]}
             compute:
               mapped_data:
                 cinder_enable_nfs_backend: {get_input: cinder_enable_nfs_backend}
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 9d4aafa8..9c8d7570 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -545,7 +545,14 @@ resources:
           str_replace:
             template: "'IP'"
             params:
-              IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, CinderIscsiNetwork]}]}
+              IP:
+                get_attr:
+                  - NetIpMap
+                  - net_ip_map
+                  - str_replace:
+                      template: "NETWORK_uri"
+                      params:
+                        NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
         cinder_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
         glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
         glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
@@ -651,7 +658,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]}
             ceph:
               mapped_data:
                 ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
@@ -899,14 +905,28 @@ 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]}
   swift_proxy_memcache:
     description: Swift proxy-memcache value
     value:
       str_replace:
         template: "IP:11211"
         params:
-          IP: {get_attr: [NetIpMap, net_ip_uri_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
+          IP:
+            get_attr:
+              - NetIpMap
+              - net_ip_map
+              - str_replace:
+                  template: "NETWORK_uri"
+                  params:
+                    NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
   tls_key_modulus_md5:
     description: MD5 checksum of the TLS Key Modulus
     value: {get_attr: [NodeTLSData, key_modulus_md5]}
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]}