From d02f9f10046f46ed13ee5d656ef9293b6ae9c668 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Tue, 29 Sep 2020 12:05:47 +0530 Subject: [PATCH] Network config with ansible for all multinode jobs This changes all multinode jobs to use ansible for network config rendering. Depends-On: https://review.opendev.org/754914 Change-Id: Icfa23c308736496b33e6fc4d4ccd62d6880f7b2b --- ci/environments/multinode-containers.yaml | 8 ++++++-- ci/environments/scenario000-multinode-containers.yaml | 8 ++++++-- ci/environments/scenario001-multinode-containers.yaml | 8 ++++++-- ci/environments/scenario007-multinode-containers.yaml | 8 ++++++-- ci/environments/scenario010-multinode-containers.yaml | 8 ++++++-- ci/environments/scenario012-standalone.yaml | 2 -- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index bc2212aa9c..0b339b857e 100644 --- a/ci/environments/multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml index 720c4666f6..2c8e3d367a 100644 --- a/ci/environments/scenario000-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index b300692f5b..2eb8c5a85e 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index 10aae9085f..a79f620f0d 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index f896bce1b7..f0f2b40f30 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario012-standalone.yaml b/ci/environments/scenario012-standalone.yaml index 53a289f25e..0689e9c04f 100644 --- a/ci/environments/scenario012-standalone.yaml +++ b/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