From b19b88bd1c9944aec1ba96e6d8b99099d54a95f0 Mon Sep 17 00:00:00 2001
From: Dan Sneddon <dsneddon@redhat.com>
Date: Fri, 21 Jul 2017 14:33:33 -0700
Subject: Render VIPs dynamically based on network_data.yaml

This change modifies the templates to dynamically define the VIPs
based on network_data.yaml. If a network is defined and marked
with "vip: true" in network_data.yaml, it will be included in the
overcloud.yaml which defines the deployment-level resources.

This should make it possible to create custom networks and
use them for services which use high-availability through VIPs.

Also, extraconfig/nova_metadata/krb-service-pricipals.yaml
was modified to dynamically produce the FQDN map for VIPs on
isolated networks, to match overcloud.j2.yaml.

Depends-On: If074f87494a46305c990a0ea332c7b576d3c6ed8
Depends-On: Iab8aca2f1fcaba0c8f109717a4b3068f629c9aab
Partially-implements: blueprint composable-networks
Closes-bug: 1667104
Change-Id: I71339a6ac41133e95dbc3f93abb7a9fdeb0f2da0
---
 network/ports/net_vip_map_external_v6.yaml | 88 ------------------------------
 1 file changed, 88 deletions(-)
 delete mode 100644 network/ports/net_vip_map_external_v6.yaml

(limited to 'network/ports/net_vip_map_external_v6.yaml')

diff --git a/network/ports/net_vip_map_external_v6.yaml b/network/ports/net_vip_map_external_v6.yaml
deleted file mode 100644
index 72e60cb2..00000000
--- a/network/ports/net_vip_map_external_v6.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-heat_template_version: pike
-
-parameters:
-  # Set these via parameter defaults to configure external VIPs
-  ControlPlaneIP:
-    default: ''
-    type: string
-  ExternalNetworkVip:
-    default: ''
-    type: string
-  InternalApiNetworkVip:
-    default: ''
-    type: string
-  StorageNetworkVip:
-    default: ''
-    type: string
-  StorageMgmtNetworkVip:
-    default: ''
-    type: string
-  # The following are unused in this template
-  ControlPlaneIp:
-    default: ''
-    type: string
-  ExternalIp:
-    default: ''
-    type: string
-  ExternalIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  InternalApiIp:
-    default: ''
-    type: string
-  InternalApiIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageIp:
-    default: ''
-    type: string
-  StorageIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-  StorageMgmtIp:
-    default: ''
-    type: string
-  StorageMgmtIpUri:
-    default: ''
-    type: string
-    description: IP address with brackets in case of IPv6
-
-outputs:
-  net_ip_map:
-    description: >
-      A Hash containing a mapping of network names to assigned IPs
-      for a specific machine.
-    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:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: ExternalNetworkVip}
-            - ']'
-      internal_api_uri:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: InternalApiNetworkVip}
-            - ']'
-      storage_uri:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: StorageNetworkVip}
-            - ']'
-      storage_mgmt_uri:
-        list_join:
-          - ''
-          - - '['
-            - {get_param: StorageMgmtNetworkVip}
-            - ']'
-- 
cgit 1.2.3-korg