From 6de80864afc447e7a049e4ced36ef01d1dfbda14 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Fri, 2 Oct 2020 12:51:28 +0530
Subject: [PATCH] Use native ansible for nic configuration in some envs

This changes the following environments
- net-multiple-nics.j2.yaml
- net-multiple-nics-vlans.j2.yaml
- net-single-nic-with-vlans.j2.yaml
- net-single-nic-with-vlans-no-external.j2.yaml

Change-Id: I4713ffc15c9be0f303790ae29910f7d2738cfae8
---
 environments/net-multiple-nics-vlans.j2.yaml  | 14 +++++++++++--
 environments/net-multiple-nics.j2.yaml        | 14 +++++++++++--
 ...-single-nic-with-vlans-no-external.j2.yaml | 21 ++++++++++++-------
 .../net-single-nic-with-vlans.j2.yaml         | 12 +++++++++--
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/environments/net-multiple-nics-vlans.j2.yaml b/environments/net-multiple-nics-vlans.j2.yaml
index 7ce7159c5d..2bacdc6b1f 100644
--- a/environments/net-multiple-nics-vlans.j2.yaml
+++ b/environments/net-multiple-nics-vlans.j2.yaml
@@ -8,6 +8,16 @@
 #
 resource_registry:
 {%- for role in roles %}
-  # Network configuration assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
+{%- endfor %}
+parameter_defaults:
+{%- for role in roles %}
+{%- if 'external_bridge' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics_vlans/multiple_nics_valns_dvr.j2'
+{%- elif 'ovsdpdk' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics_vlans/multiple_nics_vlans.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
 {%- endfor %}
diff --git a/environments/net-multiple-nics.j2.yaml b/environments/net-multiple-nics.j2.yaml
index 70749ea433..708bdd586d 100644
--- a/environments/net-multiple-nics.j2.yaml
+++ b/environments/net-multiple-nics.j2.yaml
@@ -14,6 +14,16 @@
 
 resource_registry:
 {%- for role in roles %}
-  # Network configuration assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/multiple-nics/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
+{%- endfor %}
+parameter_defaults:
+{%- for role in roles %}
+{%- if 'external_bridge' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics/multiple_nics_dvr.j2'
+{%- elif 'ovsdpdk' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics/multiple_nics_dpdk.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/multiple_nics/multiple_nics.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
 {%- endfor %}
diff --git a/environments/net-single-nic-with-vlans-no-external.j2.yaml b/environments/net-single-nic-with-vlans-no-external.j2.yaml
index ea35d4cb4d..c23ca5a67e 100644
--- a/environments/net-single-nic-with-vlans-no-external.j2.yaml
+++ b/environments/net-single-nic-with-vlans-no-external.j2.yaml
@@ -12,12 +12,17 @@ resource_registry:
   # Set external ports to noop
   OS::TripleO::Network::External: OS::Heat::None
   OS::TripleO::Controller::Ports::ExternalPort: ../network/ports/noop.yaml
-
-  # Configure other ports as normal
-{%- for role in roles if role.name != "Controller" %}
-  # Network configuration assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
+{%- for role in roles %}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
+{%- endfor %}
+  # Configure other ports as normal
+parameter_defaults:
+{%- for role in roles %}
+{%- if 'controller' not in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
+  # Network configuration assignments for the {{role.name}}
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/controller_no_external.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
 {%- endfor %}
-
-  # FIXME this should really be handled via enabled networks in roles_data not overriding here.
-  OS::TripleO::Controller::Net::SoftwareConfig: ../network/config/single-nic-vlans/controller-no-external.yaml
diff --git a/environments/net-single-nic-with-vlans.j2.yaml b/environments/net-single-nic-with-vlans.j2.yaml
index fb9d6b1df6..04117ee818 100644
--- a/environments/net-single-nic-with-vlans.j2.yaml
+++ b/environments/net-single-nic-with-vlans.j2.yaml
@@ -14,6 +14,14 @@
 
 resource_registry:
 {%- for role in roles %}
-  # Network configuration assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
+{%- endfor %}
+parameter_defaults:
+{%- for role in roles %}
+{%- if 'storage' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans_storage.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_vlans/single_nic_vlans.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
 {%- endfor %}