Merge "featureset002 was lagging behind featureset001"
This commit is contained in:
commit
3224769e3d
|
@ -23,6 +23,46 @@ containerized_overcloud: >-
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
delete_docker_cache: true
|
delete_docker_cache: true
|
||||||
|
|
||||||
|
containerized_undercloud: >-
|
||||||
|
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||||
|
true
|
||||||
|
{%- else -%}
|
||||||
|
false
|
||||||
|
{%- endif -%}
|
||||||
|
undercloud_install_cli_options: >-
|
||||||
|
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||||
|
--use-heat
|
||||||
|
{%- endif -%}
|
||||||
|
|
||||||
|
ctlplane_masquerade: >-
|
||||||
|
{% if release not in ['newton','ocata','pike','queens'] -%}
|
||||||
|
true
|
||||||
|
{%- else -%}
|
||||||
|
false
|
||||||
|
{%- endif -%}
|
||||||
|
|
||||||
|
undercloud_enable_routed_networks: >-
|
||||||
|
{% if release not in ['newton','ocata','pike'] -%}
|
||||||
|
true
|
||||||
|
{%- else -%}
|
||||||
|
false
|
||||||
|
{%- endif -%}
|
||||||
|
|
||||||
|
undercloud_clean_nodes: >-
|
||||||
|
{% if release not in ['newton','ocata','pike'] -%}
|
||||||
|
true
|
||||||
|
{%- else -%}
|
||||||
|
false
|
||||||
|
{%- endif -%}
|
||||||
|
|
||||||
|
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": "{{ overcloud_templates_path }}/net-config-undercloud.yaml"
|
||||||
|
|
||||||
# Tell tripleo about our environment.
|
# Tell tripleo about our environment.
|
||||||
enable_pacemaker: true
|
enable_pacemaker: true
|
||||||
network_isolation: true
|
network_isolation: true
|
||||||
|
@ -31,6 +71,14 @@ network_isolation_args: >-
|
||||||
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
|
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-isolation-absolute.yaml
|
||||||
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
|
-e {{ overcloud_templates_path }}/ci/environments/network/multiple-nics/network-environment.yaml
|
||||||
|
|
||||||
|
# This featureset is extremely resource intensive, so we disable telemetry
|
||||||
|
# in order to reduce the overall memory footprint
|
||||||
|
# This is not required in newton
|
||||||
|
telemetry_args: >-
|
||||||
|
{% if release != 'newton' %}
|
||||||
|
-e {{ overcloud_templates_path }}/environments/disable-telemetry.yaml
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
extra_args: >-
|
extra_args: >-
|
||||||
--ntp-server pool.ntp.org
|
--ntp-server pool.ntp.org
|
||||||
{% if release not in ['newton', 'ocata', 'pike'] %}
|
{% if release not in ['newton', 'ocata', 'pike'] %}
|
||||||
|
@ -44,7 +92,7 @@ artcl_create_docs_payload:
|
||||||
included_deployment_scripts:
|
included_deployment_scripts:
|
||||||
- undercloud-install
|
- undercloud-install
|
||||||
- overcloud-custom-tht-script
|
- overcloud-custom-tht-script
|
||||||
- overcloud-prep-containers
|
- "{% if release not in ['newton', 'ocata', 'pike'] -%}overcloud-prep-containers{%- endif -%}"
|
||||||
- overcloud-prep-flavors
|
- overcloud-prep-flavors
|
||||||
- overcloud-prep-images
|
- overcloud-prep-images
|
||||||
- overcloud-prep-network
|
- overcloud-prep-network
|
||||||
|
@ -60,7 +108,7 @@ artcl_create_docs_payload:
|
||||||
- env-setup-virt
|
- env-setup-virt
|
||||||
- undercloud-install
|
- undercloud-install
|
||||||
- overcloud-custom-tht-script
|
- overcloud-custom-tht-script
|
||||||
- overcloud-prep-containers
|
- "{% if release not in ['newton', 'ocata', 'pike'] -%}overcloud-prep-containers{%- endif -%}"
|
||||||
- overcloud-prep-flavors
|
- overcloud-prep-flavors
|
||||||
- overcloud-prep-images
|
- overcloud-prep-images
|
||||||
- overcloud-prep-network
|
- overcloud-prep-network
|
||||||
|
@ -93,38 +141,14 @@ tempest_whitelist:
|
||||||
- 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
|
- 'tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops'
|
||||||
|
|
||||||
deploy_steps_ansible_workflow: >-
|
deploy_steps_ansible_workflow: >-
|
||||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
{% if release not in ['newton','ocata','pike'] -%}
|
||||||
true
|
true
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
false
|
false
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
|
config_download_args: >-
|
||||||
containerized_undercloud: >-
|
{% if release in ['queens'] -%}
|
||||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
|
||||||
true
|
--config-download
|
||||||
{%- else -%}
|
--verbose
|
||||||
false
|
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
undercloud_install_cli_options: >-
|
|
||||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
|
||||||
--use-heat
|
|
||||||
{%- endif -%}
|
|
||||||
|
|
||||||
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": "{{ overcloud_templates_path }}/ci/common/net-config-simple-bridge.yaml"
|
|
||||||
undercloud_enable_tempest: >-
|
|
||||||
{% if release not in ['newton', 'ocata', 'pike', 'queens'] -%}
|
|
||||||
true
|
|
||||||
{%- else -%}
|
|
||||||
false
|
|
||||||
{%- endif -%}
|
|
||||||
ctlplane_masquerade: >-
|
|
||||||
{% if release not in ['newton','ocata','pike','queens'] -%}
|
|
||||||
true
|
|
||||||
{%- else -%}
|
|
||||||
false
|
|
||||||
{%- endif -%}
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue