From c562d6dd77a3e63a66e843486998a8f81ba00ac1 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Wed, 6 Nov 2019 14:28:43 -0500
Subject: [PATCH] Add ManageNetworks parameter

The ManageNetworks parameter has been added. The parameter controls
management of the network and related resources (subnets and segments) with
either create, update, or delete operations (depending on the stack
operation).  Does not apply to ports which will always be managed as
needed. Defaults to true.

For multi-stack use cases where the network
related resources have already been managed by a separate stack, this
parameter can be set to false.

Change-Id: I5ea71eea77b9f5868ddcd468bf2d3c4ab78d7c02
(cherry picked from commit aade43dd12498a54fba34e056342ed480ae9c5f7)
---
 network/network.j2                            | 39 +++++++++++++++++--
 .../manage-networks-9b1e5be19180deff.yaml     | 10 +++++
 2 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/manage-networks-9b1e5be19180deff.yaml

diff --git a/network/network.j2 b/network/network.j2
index 9ce02906a0..f2fc759fe8 100644
--- a/network/network.j2
+++ b/network/network.j2
@@ -127,10 +127,24 @@ parameters:
       when the subnet is created.
     type: json
 {%- endfor %}
+  ManageNetworks:
+    default: true
+    type: boolean
+    description: >
+      Manage the network and related resources (subnets and segments) with
+      either create, update, or delete operations (depending on the stack
+      operation). Does not apply to ports which will always be managed as
+      needed. Defaults to true. For multi-stack use cases where the network
+      related resources have already been managed by a separate stack, this
+      parameter can be set to false.
+
+conditions:
+  manage_networks: {get_param: ManageNetworks}
 
 resources:
   {{network.name}}Network:
     type: OS::Neutron::Net
+    condition: manage_networks
 {%- if network.external_resource_network_id|default('') %}
     external_id: {{ network.external_resource_network_id }}
 {%- endif %}
@@ -145,6 +159,7 @@ resources:
 
   {{network.name}}Subnet:
     type: OS::Neutron::Subnet
+    condition: manage_networks
 {%- if network.external_resource_subnet_id|default('') %}
     external_id: {{ network.external_resource_subnet_id }}
 {%- endif %}
@@ -168,6 +183,7 @@ resources:
 {% for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
   {{network.name}}Segment_{{subnet}}:
     type: OS::Neutron::Segment
+    condition: manage_networks
     # NOTE(hjensas): Depends-On here to ensure we always create the base subnet
     #   first. We can only set the segment for existing subnet if there is only
     #   one segment and only one existing subnet on the network.
@@ -184,6 +200,7 @@ resources:
 
   {{network.name}}Subnet_{{subnet}}:
     type: OS::Neutron::Subnet
+    condition: manage_networks
 {%- if network.subnets[subnet].external_resource_subnet_id|default('') %}
     external_id: {{ network.subnets[subnet].external_resource_subnet_id }}
 {%- endif %}
@@ -212,8 +229,24 @@ outputs:
     description: List of {{network.name}} network's subnets in CIDR notation.
     value:
       list_concat:
-      - - {get_attr: [{{network.name}}Subnet, cidr]}
-      -
+        if:
+          - manage_networks
+          - - - {get_attr: [{{network.name}}Subnet, cidr]}
+            -
 {%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
-        - {get_attr: [{{network.name}}Subnet_{{subnet}}, cidr]}
+              - {get_attr: [{{network.name}}Subnet_{{subnet}}, cidr]}
+{%- endfor %}
+          - -
+{%- if network.ipv6 or ipv6_override %}
+              - {{network.ipv6_subnet|default(network.ip_subnet|default(""))}}
+{%- else %}
+              - "{{network.ip_subnet|default("")}}"
+{%- endif %}
+            -
+{%- for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
+{%-     if network.ipv6 or ipv6_override %}
+              - "{{network.subnets[subnet]['ipv6_subnet']|default(network.subnets[subnet]['ip_subnet']|default(""))}}"
+{%-     else %}
+              - "{{network.subnets[subnet]['ip_subnet']|default("")}}"
+{%-     endif %}
 {%- endfor %}
diff --git a/releasenotes/notes/manage-networks-9b1e5be19180deff.yaml b/releasenotes/notes/manage-networks-9b1e5be19180deff.yaml
new file mode 100644
index 0000000000..e70731fffb
--- /dev/null
+++ b/releasenotes/notes/manage-networks-9b1e5be19180deff.yaml
@@ -0,0 +1,10 @@
+---
+features:
+  - The ManageNetworks parameter has been added. The parameter controls
+    management of the network and related resources (subnets and segments) with
+    either create, update, or delete operations (depending on the stack
+    operation).  Does not apply to ports which will always be managed as
+    needed. Defaults to true. For multi-stack use cases where the network
+    related resources have already been managed by a separate stack, this
+    parameter can be set to false.
+