openstack/tripleo-quickstart
Code Issues Proposed changes

Drop OS::TripleO::Undercloud::Net::SoftwareConfig mappings

Browse Source 
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
This commit is contained in:
Rabi Mishra 2020-10-06 09:34:20 +05:30
parent cef413058b
commit cb3ea1affc
23 changed files with 0 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/general_config/featureset001.yml
View File

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

2
config/general_config/featureset002.yml
View File

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

2
config/general_config/featureset010.yml
View File

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

2
config/general_config/featureset016.yml
View File

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

2
config/general_config/featureset017.yml
View File

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

2
config/general_config/featureset018.yml
View File

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

2
config/general_config/featureset019.yml
View File

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

2
config/general_config/featureset020.yml
View File

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

2
config/general_config/featureset027.yml
View File

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

2
config/general_config/featureset030.yml
View File

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

2
config/general_config/featureset031.yml
View File

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

2
config/general_config/featureset032.yml
View File

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

2
config/general_config/featureset035.yml
View File

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

2
config/general_config/featureset037.yml
View File

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

2
config/general_config/featureset038.yml
View File

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

2
config/general_config/featureset039.yml
View File

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

2
config/general_config/featureset040.yml
View File

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

2
config/general_config/featureset041.yml
View File

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

2
config/general_config/featureset043.yml
View File

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

2
config/general_config/featureset051.yml
View File

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

2
config/general_config/featureset053.yml
View File

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

2
config/general_config/featureset061.yml
View File

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

2
config/general_config/minimal.yml
View File

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