From 0d51947872642000ccac77fcb254a369034c0c56 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Sat, 26 Sep 2020 12:33:17 +0530
Subject: [PATCH] Network config with ansible for ci jobs using multi-nics

OVB jobs use a different multi-nic nic config. Generate that with
ansible.

Depends-On: https://review.opendev.org/754491
Change-Id: I5ea2615e773ee7656e85f172695ad08cd0312c56
---
 .../multiple-nics/network-environment.yaml    | 24 ++++++++++++++-----
 net-config-noop.j2.yaml                       |  9 ++++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/ci/environments/network/multiple-nics/network-environment.yaml b/ci/environments/network/multiple-nics/network-environment.yaml
index efa48a7f8f..996e70962b 100644
--- a/ci/environments/network/multiple-nics/network-environment.yaml
+++ b/ci/environments/network/multiple-nics/network-environment.yaml
@@ -1,13 +1,25 @@
 
 resource_registry:
-  OS::TripleO::BlockStorage::Net::SoftwareConfig: nic-configs/cinder-storage.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: nic-configs/compute-dvr.yaml
-  OS::TripleO::Controller::Net::SoftwareConfig: nic-configs/controller.yaml
-  OS::TripleO::CellController::Net::SoftwareConfig: nic-configs/controller.yaml
-  OS::TripleO::ObjectStorage::Net::SoftwareConfig: nic-configs/swift-storage.yaml
-  OS::TripleO::CephStorage::Net::SoftwareConfig: nic-configs/ceph-storage.yaml
+  OS::TripleO::BlockStorage::Net::SoftwareConfig: ../../../../net-config-noop.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../../../../net-config-noop.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../../../../net-config-noop.yaml
+  OS::TripleO::CellController::Net::SoftwareConfig: ../../../../net-config-noop.yaml
+  OS::TripleO::ObjectStorage::Net::SoftwareConfig: ../../../../net-config-noop.yaml
+  OS::TripleO::CephStorage::Net::SoftwareConfig: ../../../../net-config-noop.yaml
 
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/multiple_nics.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/multiple_nics.j2'
+  ComputeNetworkConfigWithAnsible: true
+  BlockStorageNetworkConfigTemplate: 'templates/ci/multiple_nics.j2'
+  BlockStorageNetworkConfigWithAnsible: true
+  CellControllerNetworkConfigTemplate: 'templates/ci/multiple_nics.j2'
+  CellControllerNetworkConfigWithAnsible: true
+  ObjectStorageNetworkConfigTemplate: 'templates/ci/multiple_nics.j2'
+  ObjectStorageNetworkConfigWithAnsible: true
+  CephStorageNetworkConfigTemplate: 'templates/ci/multiple_nics.j2'
+  CephStorageNetworkConfigWithAnsible: true
   ExternalNetCidr: 10.0.0.0/24
   ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}]
   ExternalInterfaceDefaultRoute: 10.0.0.1
diff --git a/net-config-noop.j2.yaml b/net-config-noop.j2.yaml
index d61f4f4173..c08810f10c 100644
--- a/net-config-noop.j2.yaml
+++ b/net-config-noop.j2.yaml
@@ -72,12 +72,11 @@ parameters:
 
 resources:
   OsNetConfigImpl:
-    type: OS::Heat::StructuredConfig
+    type: OS::Heat::Value
     properties:
-      group: apply-config
-      config: {}
+      value: {}
 
 outputs:
-  OS::stack_id:
+  config:
     description: The OsNetConfigImpl resource.
-    value: {get_resource: OsNetConfigImpl}
+    value: {get_attr: [OsNetConfigImpl, value]}