openstack/tripleo-heat-templates
Code Issues Proposed changes

Use OS::Heat::None in place of net-config-noop.yaml

Browse Source 
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
This commit is contained in:
Rabi Mishra 2020-09-29 19:08:09 +05:30
parent be06f959cd
commit 6f0c7a1090
13 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/multinode-containers.yaml
View File

@ -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:

9
ci/environments/network/multiple-nics/network-environment.yaml
View File

@ -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

4
ci/environments/scenario000-multinode-containers.yaml
View File

@ -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

2
ci/environments/scenario001-multinode-containers.yaml
View File

@ -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

2
ci/environments/scenario007-multinode-containers.yaml
View File

@ -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

2
ci/environments/scenario010-multinode-containers.yaml
View File

@ -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

3
common/deploy-steps.j2
View File

@ -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

2
environments/net-noop.j2.yaml
View File

@ -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 %}

1
environments/standalone/standalone-overcloud.yaml
View File

@ -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

1
environments/standalone/standalone-tripleo.yaml
View File

@ -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

1
environments/undercloud.yaml
View File

@ -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

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -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 %}

3
sample-env-generator/standalone.yaml
View File

@ -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