openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Switch more promotion jobs to containerized undercloud"

This commit is contained in:
Zuul 2018-06-18 21:36:23 +00:00 committed by Gerrit Code Review
parent c0c05ea745 46e8af3f72
commit 1b19b53b13
3 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
config/general_config/featureset002.yml
View File

@ -98,3 +98,33 @@ deploy_steps_ansible_workflow: >-
{%- else -%}
false
{%- endif -%}
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 -%}
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 -%}

30
config/general_config/featureset020.yml
View File

@ -74,3 +74,33 @@ deploy_steps_ansible_workflow: >-
{%- else -%}
false
{%- endif -%}
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 -%}
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 -%}

24
config/general_config/featureset037.yml
View File

@ -64,3 +64,27 @@ config_download_args: >-
--disable-validations
--verbose
{%- endif -%}
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 -%}
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"
ctlplane_masquerade: >-
{% if release not in ['newton','ocata','pike','queens'] -%}
true
{%- else -%}
false
{%- endif -%}