From a465b8dddf44f0d9e34190f680deda387f303b60 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Wed, 9 Aug 2017 19:17:49 +0100
Subject: Convert network templates to be rendered via j2

Use the network.network.j2.yaml to render these files, instead
of relying on the hard-coded versions.

Note this doesn't currently consider the _v6 templates as we may want
to deprecate these and instead rely on an ipv6 specific network_data file,
or perhaps make the network/network.network.j2.yaml generic and able to
detect the version from the cidr?

Change-Id: I662e8d0b3737c7807d18c8917bfce1e25baa3d8a
Partially-Implements: blueprint composable-networks
---
 network/tenant.yaml | 65 -----------------------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 network/tenant.yaml

(limited to 'network/tenant.yaml')

diff --git a/network/tenant.yaml b/network/tenant.yaml
deleted file mode 100644
index 67c4abbc..00000000
--- a/network/tenant.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-heat_template_version: pike
-
-description: >
-  Tenant network.
-
-parameters:
-  # the defaults here work for static IP assignment (IPAM) only
-  TenantNetCidr:
-    default: '172.16.0.0/24'
-    description: Cidr for the tenant network.
-    type: string
-  TenantNetValueSpecs:
-    default: {'provider:physical_network': 'tenant', 'provider:network_type': 'flat'}
-    description: Value specs for the tenant network.
-    type: json
-  TenantNetAdminStateUp:
-    default: false
-    description: The admin state of the network.
-    type: boolean
-  TenantNetEnableDHCP:
-    default: false
-    description: Whether to enable DHCP on the associated subnet.
-    type: boolean
-  TenantNetShared:
-    default: false
-    description: Whether this network is shared across all tenants.
-    type: boolean
-  TenantNetName:
-    default: tenant
-    description: The name of the tenant network.
-    type: string
-  TenantSubnetName:
-    default: tenant_subnet
-    description: The name of the tenant subnet in Neutron.
-    type: string
-  TenantAllocationPools:
-    default: [{'start': '172.16.0.4', 'end': '172.16.0.250'}]
-    description: Ip allocation pool range for the tenant network.
-    type: json
-
-resources:
-  TenantNetwork:
-    type: OS::Neutron::Net
-    properties:
-      admin_state_up: {get_param: TenantNetAdminStateUp}
-      name: {get_param: TenantNetName}
-      shared: {get_param: TenantNetShared}
-      value_specs: {get_param: TenantNetValueSpecs}
-
-  TenantSubnet:
-    type: OS::Neutron::Subnet
-    properties:
-      cidr: {get_param: TenantNetCidr}
-      enable_dhcp: {get_param: TenantNetEnableDHCP}
-      name: {get_param: TenantSubnetName}
-      network: {get_resource: TenantNetwork}
-      allocation_pools: {get_param: TenantAllocationPools}
-      gateway_ip: null
-
-outputs:
-  OS::stack_id:
-    description: Neutron tenant network
-    value: {get_resource: TenantNetwork}
-  subnet_cidr:
-    value: {get_attr: [TenantSubnet, cidr]}
-- 
cgit 1.2.3-korg