commit ea3230188fd06e6a4c7ec4137680430cf91bbcb3
Author: Rabi Mishra <ramishra@redhat.com>
Date:   Thu Oct 8 09:56:24 2020 +0530

    Remove resource_registry args for some multinode features
    
    This removes the resource registry args for some multinode
    scenarios that are currently used. There are also a bunch of
    multinode scenarios that seems to have been converted to
    standalone ones. They dont even have appropriate envs in tht.
    Those are not changed with this patch and should be cleaned in
    a separate patch.
    
    Change-Id: Ia40bf244f91c61b8d67eadb5b00a6cade28d00b2

diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml
index 8388de0..5dbaa34 100644
--- a/config/general_config/featureset010.yml
+++ b/config/general_config/featureset010.yml
@@ -17,8 +17,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_resource_registry_args:
-  "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
 
 # This enables TLS for the undercloud which will also make haproxy bind to the
 # configured public-vip and admin-vip.
diff --git a/config/general_config/featureset016.yml b/config/general_config/featureset016.yml
index c167d66..479f5ad 100644
--- a/config/general_config/featureset016.yml
+++ b/config/general_config/featureset016.yml
@@ -31,8 +31,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_resource_registry_args:
-  "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
 undercloud_enable_tempest: >-
   {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
   true
diff --git a/config/general_config/featureset030.yml b/config/general_config/featureset030.yml
index 01428bf..c070420 100644
--- a/config/general_config/featureset030.yml
+++ b/config/general_config/featureset030.yml
@@ -19,8 +19,6 @@ undercloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
 undercloud_cloud_domain: "localdomain"
 undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
-undercloud_resource_registry_args:
-  "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
 undercloud_enable_tempest: >-
   {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
   true