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

This commit is contained in:
Zuul 2020-10-14 15:15:51 +00:00 committed by Gerrit Code Review
commit eb8691d564
20 changed files with 0 additions and 40 deletions

View File

@ -52,8 +52,6 @@ undercloud_inspection_extras: false
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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. # Tell tripleo about our environment.
enable_pacemaker: true enable_pacemaker: true

View File

@ -64,8 +64,6 @@ undercloud_inspection_extras: false
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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. # Tell tripleo about our environment.
enable_pacemaker: true enable_pacemaker: true

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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: >- undercloud_enable_tempest: >-
{% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
true true

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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: >- undercloud_enable_tempest: >-
{% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
true true

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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 # options below direct automatic doc generation by tripleo-collect-logs
artcl_gen_docs: true artcl_gen_docs: true

View File

@ -59,8 +59,6 @@ undercloud_inspection_extras: false
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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 # Tell tripleo about our environment
enable_pacemaker: true enable_pacemaker: true

View File

@ -20,8 +20,6 @@ undercloud_cloud_domain: "localDomain"
undercloud_undercloud_hostname: "underCloud.{{ undercloud_cloud_domain }}" undercloud_undercloud_hostname: "underCloud.{{ undercloud_cloud_domain }}"
undercloud_undercloud_public_host: "{{ ansible_hostname }}-unique" undercloud_undercloud_public_host: "{{ ansible_hostname }}-unique"
tripleo_set_unique_hostname: true 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 # turn off image prep
step_overcloud_image: false step_overcloud_image: false

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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: >- undercloud_enable_tempest: >-
{% if release not in ['ocata', 'pike', 'queens', 'rocky'] -%} {% if release not in ['ocata', 'pike', 'queens', 'rocky'] -%}
true true

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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 # Tempest configuration, keep always at the end of the file
# Run tempest in containers when at least undercloud is containerized # Run tempest in containers when at least undercloud is containerized

View File

@ -45,8 +45,6 @@ undercloud_inspection_extras: false
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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. # Tell tripleo about our environment.
overcloud_ipv6: true overcloud_ipv6: true

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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: >- ctlplane_masquerade: >-
{% if release not in ['newton','ocata','pike','queens'] -%} {% if release not in ['newton','ocata','pike','queens'] -%}
true true

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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: >- undercloud_enable_tempest: >-
{% if release not in ['newton', 'ocata', 'pike', 'queens'] -%} {% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
true true

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 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_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 ### ### Keycloak IdP ###

View File

@ -106,8 +106,6 @@ containerized_undercloud: >-
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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 # Tempest configuration, keep always at the end of the file
test_ping: false test_ping: false

View File

@ -52,8 +52,6 @@ undercloud_inspection_extras: false
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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. # Tell tripleo about our environment.
enable_pacemaker: true enable_pacemaker: true

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

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_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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: >- ctlplane_masquerade: >-
{% if release not in ['newton','ocata','pike','queens'] -%} {% if release not in ['newton','ocata','pike','queens'] -%}
true true

View File

@ -52,8 +52,6 @@ undercloud_inspection_extras: false
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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. # Tell tripleo about our environment.
enable_pacemaker: true enable_pacemaker: true

View File

@ -19,8 +19,6 @@ undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}"
# TODO(aschultz): fix with ssl # TODO(aschultz): fix with ssl
# undercloud_undercloud_public_host: "{{ ansible_fqdn }}-unique" # undercloud_undercloud_public_host: "{{ ansible_fqdn }}-unique"
# tripleo_set_unique_hostname: true # 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 # turn off image prep
step_overcloud_image: false step_overcloud_image: false

View File

@ -32,8 +32,6 @@ containerized_undercloud: >-
undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml" undercloud_custom_env_files: "{{ working_dir }}/undercloud-parameter-defaults.yaml"
undercloud_cloud_domain: "localdomain" undercloud_cloud_domain: "localdomain"
undercloud_undercloud_hostname: "undercloud.{{ undercloud_cloud_domain }}" 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: >- ctlplane_masquerade: >-
{% if release not in ['newton','ocata','pike','queens'] -%} {% if release not in ['newton','ocata','pike','queens'] -%}