diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-08-11 22:29:16 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-08-16 14:36:47 +0000 |
| commit | 80e82be09b2354fe21f51784542973bb479c6364 (patch) | |
| tree | dfa014721e04cd2025200c6124127aa81a4ed750 /network/ports/net_vip_map_external_v6.yaml | |
| parent | 248068bd97a9159623f226aa74c9b3ea775346a3 (diff) | |
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
Diffstat (limited to 'network/ports/net_vip_map_external_v6.yaml')
| -rw-r--r-- | network/ports/net_vip_map_external_v6.yaml | 21 |
1 files changed, 5 insertions, 16 deletions
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: - '' - - '[' |