commit cb3ea1affc84d54d1bcdcb819dfba0a0dc1c147d Author: Rabi Mishra Date: Tue Oct 6 09:34:20 2020 +0530 Drop OS::TripleO::Undercloud::Net::SoftwareConfig mappings Removes the redundant undercloud mapping from featuresets. We've the default mapping in environments/undercloud.yaml. Also this CI specific environment is redundant. Change-Id: I72e41fb8cdebff12aab9704c2a9c4e368410c1ad diff --git a/config/general_config/featureset001.yml b/config/general_config/featureset001.yml index fc16e13..228e9d1 100644 --- a/config/general_config/featureset001.yml +++ b/config/general_config/featureset001.yml @@ -52,8 +52,6 @@ undercloud_inspection_extras: false 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 }}/net-config-undercloud.yaml" # Tell tripleo about our environment. enable_pacemaker: true diff --git a/config/general_config/featureset002.yml b/config/general_config/featureset002.yml index 9e0b1ab..c4236c7 100644 --- a/config/general_config/featureset002.yml +++ b/config/general_config/featureset002.yml @@ -64,8 +64,6 @@ undercloud_inspection_extras: false 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 }}/net-config-undercloud.yaml" # Tell tripleo about our environment. enable_pacemaker: true 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/featureset017.yml b/config/general_config/featureset017.yml index 5cdc384..d20fb6d 100644 --- a/config/general_config/featureset017.yml +++ b/config/general_config/featureset017.yml @@ -27,8 +27,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/featureset018.yml b/config/general_config/featureset018.yml index d5aa23a..901ee9f 100644 --- a/config/general_config/featureset018.yml +++ b/config/general_config/featureset018.yml @@ -29,8 +29,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/featureset019.yml b/config/general_config/featureset019.yml index 926b2fc..bad6b15 100644 --- a/config/general_config/featureset019.yml +++ b/config/general_config/featureset019.yml @@ -29,8 +29,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" # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset020.yml b/config/general_config/featureset020.yml index 505ff97..92ccf9c 100644 --- a/config/general_config/featureset020.yml +++ b/config/general_config/featureset020.yml @@ -59,8 +59,6 @@ undercloud_inspection_extras: false 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 }}/net-config-undercloud.yaml" # Tell tripleo about our environment enable_pacemaker: true diff --git a/config/general_config/featureset027.yml b/config/general_config/featureset027.yml index 36ba37b..bf4a051 100644 --- a/config/general_config/featureset027.yml +++ b/config/general_config/featureset027.yml @@ -20,8 +20,6 @@ undercloud_cloud_domain: "localDomain" undercloud_undercloud_hostname: "underCloud.{{ undercloud_cloud_domain }}" undercloud_undercloud_public_host: "{{ ansible_hostname }}-unique" tripleo_set_unique_hostname: true -undercloud_resource_registry_args: - "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/net-config-undercloud.yaml" # turn off image prep step_overcloud_image: false 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 diff --git a/config/general_config/featureset031.yml b/config/general_config/featureset031.yml index 913c083..e54ddc3 100644 --- a/config/general_config/featureset031.yml +++ b/config/general_config/featureset031.yml @@ -56,8 +56,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 ['ocata', 'pike', 'queens', 'rocky'] -%} true diff --git a/config/general_config/featureset032.yml b/config/general_config/featureset032.yml index 316b9ae..35131e7 100644 --- a/config/general_config/featureset032.yml +++ b/config/general_config/featureset032.yml @@ -55,8 +55,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 }}/net-config-undercloud.yaml" # Tempest configuration, keep always at the end of the file # Run tempest in containers when at least undercloud is containerized diff --git a/config/general_config/featureset035.yml b/config/general_config/featureset035.yml index 08c8a34..aea2af5 100644 --- a/config/general_config/featureset035.yml +++ b/config/general_config/featureset035.yml @@ -45,8 +45,6 @@ undercloud_inspection_extras: false 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 }}/net-config-undercloud.yaml" # Tell tripleo about our environment. overcloud_ipv6: true diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml index 71292aa..12510bb 100644 --- a/config/general_config/featureset037.yml +++ b/config/general_config/featureset037.yml @@ -88,8 +88,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 }}/net-config-undercloud.yaml" ctlplane_masquerade: >- {% if release not in ['newton','ocata','pike','queens'] -%} true diff --git a/config/general_config/featureset038.yml b/config/general_config/featureset038.yml index 9ecf24a..7df1bc4 100644 --- a/config/general_config/featureset038.yml +++ b/config/general_config/featureset038.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 }}/net-config-undercloud.yaml" undercloud_enable_tempest: >- {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} true diff --git a/config/general_config/featureset039.yml b/config/general_config/featureset039.yml index beab194..498b3bf 100644 --- a/config/general_config/featureset039.yml +++ b/config/general_config/featureset039.yml @@ -242,8 +242,6 @@ supplemental_user: centos supplemental_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" -undercloud_resource_registry_args: - "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/net-config-undercloud.yaml" ### Keycloak IdP ### diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml index 0f1c85b..d2b927d 100644 --- a/config/general_config/featureset040.yml +++ b/config/general_config/featureset040.yml @@ -106,8 +106,6 @@ containerized_undercloud: >- 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" # Tempest configuration, keep always at the end of the file test_ping: false diff --git a/config/general_config/featureset041.yml b/config/general_config/featureset041.yml index d9a58c7..ae19ff6 100644 --- a/config/general_config/featureset041.yml +++ b/config/general_config/featureset041.yml @@ -52,8 +52,6 @@ undercloud_inspection_extras: false 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 }}/net-config-undercloud.yaml" # Tell tripleo about our environment. enable_pacemaker: true diff --git a/config/general_config/featureset043.yml b/config/general_config/featureset043.yml index ea04875..af1806a 100644 --- a/config/general_config/featureset043.yml +++ b/config/general_config/featureset043.yml @@ -182,5 +182,3 @@ supplemental_user: centos supplemental_image_url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" -undercloud_resource_registry_args: - "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/net-config-undercloud.yaml" diff --git a/config/general_config/featureset051.yml b/config/general_config/featureset051.yml index dbc2a53..09319e7 100644 --- a/config/general_config/featureset051.yml +++ b/config/general_config/featureset051.yml @@ -134,8 +134,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 }}/net-config-undercloud.yaml" ctlplane_masquerade: >- {% if release not in ['newton','ocata','pike','queens'] -%} true diff --git a/config/general_config/featureset053.yml b/config/general_config/featureset053.yml index e3b15ec..1ed0935 100644 --- a/config/general_config/featureset053.yml +++ b/config/general_config/featureset053.yml @@ -52,8 +52,6 @@ undercloud_inspection_extras: false 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 }}/net-config-undercloud.yaml" # Tell tripleo about our environment. enable_pacemaker: true diff --git a/config/general_config/featureset061.yml b/config/general_config/featureset061.yml index 71cb36c..2933832 100644 --- a/config/general_config/featureset061.yml +++ b/config/general_config/featureset061.yml @@ -19,8 +19,6 @@ undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" # TODO(aschultz): fix with ssl # undercloud_undercloud_public_host: "{{ ansible_fqdn }}-unique" # tripleo_set_unique_hostname: true -undercloud_resource_registry_args: - "OS::TripleO::Undercloud::Net::SoftwareConfig": "{{ undercloud_templates_path }}/net-config-undercloud.yaml" # turn off image prep step_overcloud_image: false diff --git a/config/general_config/minimal.yml b/config/general_config/minimal.yml index 46f9a25..bd16126 100644 --- a/config/general_config/minimal.yml +++ b/config/general_config/minimal.yml @@ -32,8 +32,6 @@ containerized_undercloud: >- 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 }}/net-config-undercloud.yaml" ctlplane_masquerade: >- {% if release not in ['newton','ocata','pike','queens'] -%}