From d88a8dc52ab4331a45a0cd92cf886274cccea73c Mon Sep 17 00:00:00 2001
From: Dan Sneddon <dsneddon@redhat.com>
Date: Wed, 30 Aug 2017 11:26:52 -0700
Subject: Remove ipv6 specific network templates

This change renders the IPv6 versions of the isolated
networks using j2. To allow for backward compatibility,
there will be 2 versions of the network definitions,
<network>.yaml and <network>_v6.yaml. If the ip_subnet
contains an IPv6 address, or if ipv6: true is set on the
network definition in network_data.yaml, then the
<network>.yaml version will contain an IPv6 definition,
otherwise the <network>.yaml will be IPv4, and the
<network>_v6.yaml will be IPv6.

In a future follow-up patch, we will probably only
create the required versions of the networks, either
IPv4, IPv6, not both.

The ipv6_subnet, ipv6_allocation_pools, and ipv6_gateway
settings in the network_data.yaml definition file are
used for the <network>_v6.yaml network definition.
Note that these subnet/cidr/gateway definitions only set
the defaults, which can be overridden with parameters
set in an environment file.

Since the parameters for IP and subnet range are the
same (e.g. InternalApiNetCidr applies to both IPv4/v6),
only one version can be used at a time. If an operator
wishes to use dual-stack IPv4/IPv6, then two different
networks should be created, and both networks can be
applied to a single interface.

Note that the workflow for the operator is the same as
before this change, but a new example template has been
added to environments/network-environment-v6.yaml.

Change-Id: I0e674e4b1e43786717ae6416571dde3a0e11a5cc
Partially-Implements: blueprint composable-networks
Closes-bug: 1714115
(cherry picked from commit dd299f08bd6b1df43760148d83ce9b6e09ba6572)
---
 network/storage_v6.yaml | 72 -------------------------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 network/storage_v6.yaml

(limited to 'network/storage_v6.yaml')

diff --git a/network/storage_v6.yaml b/network/storage_v6.yaml
deleted file mode 100644
index 51edd4b3..00000000
--- a/network/storage_v6.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Storage network.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  StorageNetCidr:
-    # OpenStack uses the EUI-64 address format, which requires a /64 prefix
-    default: 'fd00:fd00:fd00:3000::/64'
-    description: Cidr for the storage network.
-    type: string
-  StorageNetValueSpecs:
-    default: {'provider:physical_network': 'storage', 'provider:network_type': 'flat'}
-    description: Value specs for the storage network.
-    type: json
-  StorageNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  StorageNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  StorageNetName:
-    default: storage
-    description: The name of the storage network.
-    type: string
-  StorageSubnetName:
-    default: storage_subnet
-    description: The name of the storage subnet in Neutron.
-    type: string
-  StorageAllocationPools:
-    default: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}]
-    description: Ip allocation pool range for the storage network.
-    type: json
-  IPv6AddressMode:
-    default: dhcpv6-stateful
-    description: Neutron subnet IPv6 address mode
-    type: string
-  IPv6RAMode:
-    default: dhcpv6-stateful
-    description: Neutron subnet IPv6 router advertisement mode
-    type: string
-
-resources:
-  StorageNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: StorageNetAdminStateUp}
-      name: {get_param: StorageNetName}
-      shared: {get_param: StorageNetShared}
-      value_specs: {get_param: StorageNetValueSpecs}
-
-  StorageSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      ip_version: 6
-      ipv6_address_mode: {get_param: IPv6AddressMode}
-      ipv6_ra_mode: {get_param: IPv6RAMode}
-      cidr: {get_param: StorageNetCidr}
-      name: {get_param: StorageSubnetName}
-      network: {get_resource: StorageNetwork}
-      allocation_pools: {get_param: StorageAllocationPools}
-      gateway_ip: null
-
-outputs:
-  OS::stack_id:
-    description: Neutron storage network
-    value: {get_resource: StorageNetwork}
-  subnet_cidr:
-    value: {get_attr: [StorageSubnet, cidr]}
-- 
cgit 1.2.3-korg