From 6f0c7a1090511b82d9ded50f03caedb2d933170c Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Tue, 29 Sep 2020 19:08:09 +0530 Subject: [PATCH] Use OS::Heat::None in place of net-config-noop.yaml This replaces net-config-noop.yaml mappings to OS::Heat::None. Also removes all unnecessary setting of it in environments as we map them in overcloud-resource-registry-puppet.j2.yaml. Normally that should be enough but we override them in so many places, so there will be some redundancy. Depends-On: https://review.opendev.org/755275 Change-Id: Ib4d07c835568cb3072770f81a082b5a5e1c790ea --- ci/environments/multinode-containers.yaml | 2 -- .../network/multiple-nics/network-environment.yaml | 9 --------- ci/environments/scenario000-multinode-containers.yaml | 4 ---- ci/environments/scenario001-multinode-containers.yaml | 2 -- ci/environments/scenario007-multinode-containers.yaml | 2 -- ci/environments/scenario010-multinode-containers.yaml | 2 -- common/deploy-steps.j2 | 3 ++- environments/net-noop.j2.yaml | 2 +- environments/standalone/standalone-overcloud.yaml | 1 - environments/standalone/standalone-tripleo.yaml | 1 - environments/undercloud.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 2 +- sample-env-generator/standalone.yaml | 3 --- 13 files changed, 4 insertions(+), 30 deletions(-) diff --git a/ci/environments/multinode-containers.yaml b/ci/environments/multinode-containers.yaml index 0b339b857e..48ac25e79b 100644 --- a/ci/environments/multinode-containers.yaml +++ b/ci/environments/multinode-containers.yaml @@ -1,6 +1,4 @@ resource_registry: - 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: diff --git a/ci/environments/network/multiple-nics/network-environment.yaml b/ci/environments/network/multiple-nics/network-environment.yaml index 996e70962b..7dbc220c04 100644 --- a/ci/environments/network/multiple-nics/network-environment.yaml +++ b/ci/environments/network/multiple-nics/network-environment.yaml @@ -1,12 +1,3 @@ - -resource_registry: - 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 diff --git a/ci/environments/scenario000-multinode-containers.yaml b/ci/environments/scenario000-multinode-containers.yaml index 2c8e3d367a..8f203b01c9 100644 --- a/ci/environments/scenario000-multinode-containers.yaml +++ b/ci/environments/scenario000-multinode-containers.yaml @@ -1,7 +1,3 @@ -resource_registry: - 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 diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 2eb8c5a85e..b304a5f2cc 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -1,6 +1,4 @@ resource_registry: - 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 diff --git a/ci/environments/scenario007-multinode-containers.yaml b/ci/environments/scenario007-multinode-containers.yaml index a79f620f0d..7d03a62667 100644 --- a/ci/environments/scenario007-multinode-containers.yaml +++ b/ci/environments/scenario007-multinode-containers.yaml @@ -1,6 +1,4 @@ resource_registry: - 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 diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index f0f2b40f30..004f37beba 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/ci/environments/scenario010-multinode-containers.yaml @@ -1,6 +1,4 @@ resource_registry: - 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 diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 02ffdea92d..0125a3da17 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -561,6 +561,7 @@ outputs: stat: path: "{{ tripleo_role_name ~ '/NetworkConfig' }}" register: NetworkConfig_stat + when: not tripleo_network_config_with_ansible - name: Run Network Config import_role: name: tripleo_network_config @@ -574,7 +575,7 @@ outputs: tripleo_network_config_legacy_script: false tripleo_network_config_safe_defaults: "{{ network_safe_defaults }}|bool" when: - - NetworkConfig_stat.stat.exists + - tripleo_network_config_with_ansible or NetworkConfig_stat.stat.exists - name: Basic Network Validation include_role: name: tripleo_nodes_validation diff --git a/environments/net-noop.j2.yaml b/environments/net-noop.j2.yaml index ccd99b0d71..c76196e15e 100644 --- a/environments/net-noop.j2.yaml +++ b/environments/net-noop.j2.yaml @@ -1,5 +1,5 @@ # This disables network configuration entirely (No-op). resource_registry: {%- for role in roles %} - OS::TripleO::{{role.name}}::Net::SoftwareConfig: ../net-config-noop.yaml + OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None {%- endfor %} diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index f7ae2f5893..01d73b4e7a 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -105,4 +105,3 @@ resource_registry: OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None - OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 80c9b7768d..ea81f7301f 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -127,4 +127,3 @@ resource_registry: OS::TripleO::Services::SaharaEngine: OS::Heat::None OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml OS::TripleO::Services::Zaqar: OS::Heat::None - OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml index 2715475948..c3d4d2e706 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -7,7 +7,6 @@ resource_registry: OS::TripleO::Network::Ports::RedisVipPort: ../network/ports/noop.yaml OS::TripleO::Network::Ports::OVNDBsVipPort: ../network/ports/noop.yaml OS::TripleO::Network::Ports::ControlPlaneVipPort: ../deployed-server/deployed-neutron-port.yaml - OS::TripleO::Undercloud::Net::SoftwareConfig: ../net-config-noop.yaml OS::TripleO::NodeExtraConfigPost: ../extraconfig/post_deploy/undercloud_post.yaml OS::TripleO::Services::DockerRegistry: ../deployment/image-serve/image-serve-baremetal-ansible.yaml OS::TripleO::Services::ContainerImagePrepare: ../deployment/container-image-prepare/container-image-prepare-baremetal-ansible.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 81b5be930c..17cff4c12b 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -22,7 +22,7 @@ resource_registry: # Create Neutron external bridge for floating IPs and/or SNAT OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-bridge.yaml {%- else %} - OS::TripleO::{{role.name}}::Net::SoftwareConfig: net-config-noop.yaml + OS::TripleO::{{role.name}}::Net::SoftwareConfig: OS::Heat::None {%- endif %} {% endfor %} diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index e507f6f0c1..5fb6b940dc 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -66,7 +66,6 @@ environments: OS::TripleO::Network::Ports::RedisVipPort: ../../network/ports/noop.yaml OS::TripleO::Network::Ports::OVNDBsVipPort: ../../network/ports/noop.yaml OS::TripleO::Network::Ports::ControlPlaneVipPort: ../../deployed-server/deployed-neutron-port.yaml - OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml # OVN OS::TripleO::Services::OVNDBs: ../../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -199,8 +198,6 @@ environments: StandaloneNetworkConfigTemplate: templates/net_config_bridge.j2 resource_registry: - OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-noop.yaml - OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml # Don't create OVN Chassis MAC address nets/ports on the standalone