From c9a8988ab7da7096b6337f1069816daa4989353a Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Tue, 13 Oct 2020 14:15:19 +0530
Subject: [PATCH] Use native ansible for nic configuration

This changes rest of the environments to use native ansible
nic configuration.

- net-2-linux-bonds-with-vlans.j2.yaml
- net-bond-with-vlans.j2.yaml
- net-dpdkbond-with-vlans.j2.yaml
- net-single-nic-linux-bridge-with-vlans.j2.yaml

Change-Id: Ib88bdd7a2ae314205d235b15995449854088d342
---
 .../net-2-linux-bonds-with-vlans.j2.yaml      | 17 ++++++++++------
 environments/net-bond-with-vlans.j2.yaml      | 14 +++++++++++--
 environments/net-dpdkbond-with-vlans.j2.yaml  | 20 ++++++++++++-------
 ...single-nic-linux-bridge-with-vlans.j2.yaml | 13 ++++++++++--
 4 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/environments/net-2-linux-bonds-with-vlans.j2.yaml b/environments/net-2-linux-bonds-with-vlans.j2.yaml
index 6230b48861..e7b5131f57 100644
--- a/environments/net-2-linux-bonds-with-vlans.j2.yaml
+++ b/environments/net-2-linux-bonds-with-vlans.j2.yaml
@@ -6,12 +6,17 @@
 #       reuses the BondInterfaceOvsOptions parameter for both bond
 #       configurations. You can modify this template to have two
 #       different parameters for the bonds if options differ.
-#
-# FIXME: if/when we add functionality to heatclient to include heat
-# environment files we should think about using it here to automatically
-# include network-isolation.yaml.
+
 resource_registry:
 {%- for role in roles %}
-  # Network configuration assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/2-linux-bonds-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 'ovsdpdk' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/2_linux_bonds_vlans/2_linux_bonds_vlans_dpdk.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/2_linux_bonds_vlans/2_linux_bonds_vlans.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
 {%- endfor %}
diff --git a/environments/net-bond-with-vlans.j2.yaml b/environments/net-bond-with-vlans.j2.yaml
index f2f3c678ae..d9633bc38b 100644
--- a/environments/net-bond-with-vlans.j2.yaml
+++ b/environments/net-bond-with-vlans.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/bond-with-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 'ovsdpdk' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans_dpdk.j2'
+{%- elif 'storage' in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans_storage.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
 {%- endfor %}
diff --git a/environments/net-dpdkbond-with-vlans.j2.yaml b/environments/net-dpdkbond-with-vlans.j2.yaml
index b09db64b73..edd258a512 100644
--- a/environments/net-dpdkbond-with-vlans.j2.yaml
+++ b/environments/net-dpdkbond-with-vlans.j2.yaml
@@ -9,11 +9,17 @@
 # FIXME: if/when we add functionality to heatclient to include heat
 # environment files we should think about using it here to automatically
 # include network-isolation.yaml.
-resource_registry:
-{%- for role in roles if role.name != "Compute" %}
-  # Network configuration assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/bond-with-vlans/{{role.deprecated_nic_config_name|default(role.name.lower() ~ ".yaml")}}
-{%- endfor %}
 
-  # FIXME this won't handle any custom compute roles, instead we should have a generic way to override this
-  OS::TripleO::Compute::Net::SoftwareConfig: ../network/config/bond-with-vlans/compute-dpdk.yaml
+resource_registry:
+{%- for role in roles %}
+  OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None
+{%- endfor %}
+parameter_defaults:
+{%- for role in roles %}
+{%- if 'compute' not in role.tags %}
+  {{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/bonds_vlans/bonds_vlans_dpdk.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
+{%- endfor %}
diff --git a/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml b/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
index eda68623d0..c550cbe423 100644
--- a/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
+++ b/environments/net-single-nic-linux-bridge-with-vlans.j2.yaml
@@ -5,8 +5,17 @@
 # FIXME: if/when we add functionality to heatclient to include heat
 # environment files we should think about using it here to automatically
 # include network-isolation.yaml.
+
 resource_registry:
 {%- for role in roles %}
-  # Network configuration assignments for the {{role.name}}
-  OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../network/config/single-nic-linux-bridge-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_linux_bridge_vlans/single_nic_linux_bridge_vlans_storage.j2'
+{%- else %}
+  {{role.name}}NetworkConfigTemplate: 'templates/single_nic_linux_bridge_vlans/single_nic_linux_bridge_vlans.j2'
+{%- endif %}
+  {{role.name}}NetworkConfigWithAnsible: true
 {%- endfor %}