Merge "Network config with ansible for all multinode jobs"

ci/environments/multinode-containers.yaml

@@ -1,9 +1,13 @@
 resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
   OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
 
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ComputeNetworkConfigWithAnsible: true
   ControllerServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::ContainerImagePrepare

ci/environments/scenario000-multinode-containers.yaml

@@ -1,8 +1,12 @@
 resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
 
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ComputeNetworkConfigWithAnsible: true
   ControllerServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::ContainerImagePrepare

ci/environments/scenario001-multinode-containers.yaml

@@ -1,6 +1,6 @@
 resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
   OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
   OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
   OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
@@ -30,6 +30,10 @@ resource_registry:
   OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml
 
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ComputeNetworkConfigWithAnsible: true
   ControllerServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::Clustercheck

ci/environments/scenario007-multinode-containers.yaml

@@ -1,6 +1,6 @@
 resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
   OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2.yaml
   OS::TripleO::Services::NeutronApi: ../../deployment/neutron/neutron-api-container-puppet.yaml
   OS::TripleO::Services::NeutronCorePlugin: ../../deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
@@ -25,6 +25,10 @@ resource_registry:
   OS::TripleO::Services::CinderBackup: OS::Heat::None
   OS::TripleO::Services::BlockStorageCinderVolume: OS::Heat::None
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ComputeNetworkConfigWithAnsible: true
   ControllerServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::Clustercheck

ci/environments/scenario010-multinode-containers.yaml

@@ -1,6 +1,6 @@
 resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
+  OS::TripleO::Controller::Net::SoftwareConfig: ../../net-config-noop.yaml
+  OS::TripleO::Compute::Net::SoftwareConfig: ../../net-config-noop.yaml
   OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
   OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
   OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
@@ -27,6 +27,10 @@ resource_registry:
   OS::TripleO::Services::SwiftStorage: OS::Heat::None
 
 parameter_defaults:
+  ControllerNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ControllerNetworkConfigWithAnsible: true
+  ComputeNetworkConfigTemplate: 'templates/ci/multinode.j2'
+  ComputeNetworkConfigWithAnsible: true
   ControllerServices:
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::Clustercheck

ci/environments/scenario012-standalone.yaml

@@ -1,7 +1,5 @@
 # touching file so CI runs scenario012
 resource_registry:
-  OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
   OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
   OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
   OS::TripleO::Services::IronicConductor: ../../deployment/ironic/ironic-conductor-container-puppet.yaml