Add config-download back into queens CI

We incorrectly dropped the config download items in
Ic5c5df350a7eb5291d45cf8e229af575fe9bed57 for featuresets that had it
enabled in queens. Since we won't be backporting the default changes in
tripleoclient back to queens we need to add a special case for these
featuresets in queens.

Change-Id: I9aa449a3198568c25d4dbc838669f493b0e3c103
Closes-Bug: #1771549
This commit is contained in:
Alex Schultz 2018-05-21 11:23:09 -06:00
parent 606445bbb1
commit cf9a0be291
5 changed files with 26 additions and 0 deletions

View File

@ -135,3 +135,9 @@ deploy_steps_ansible_workflow: >-
{%- else -%}
false
{%- endif -%}
config_download_args: >-
{% if release in ['queens'] -%}
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
--config-download
--verbose
{%- endif -%}

View File

@ -53,6 +53,11 @@ deploy_steps_ansible_workflow: >-
false
{%- endif -%}
config_download_args: >-
{% if release in ['queens'] -%}
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
--config-download
--deployed-server
{%- endif %}
{% if release not in ['newton','ocata','pike'] -%}
-e {{ working_dir }}/config-download.yaml
--disable-validations

View File

@ -24,6 +24,11 @@ container_args: >-
-e {{ overcloud_templates_path }}/environments/kubernetes.yaml
config_download_args: >-
{% if release in ['queens'] -%}
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
--config-download
--deployed-server
{%- endif %}
-e {{ working_dir }}/config-download.yaml
--disable-validations
--verbose

View File

@ -39,6 +39,11 @@ deploy_steps_ansible_workflow: >-
false
{%- endif -%}
config_download_args: >-
{% if release in ['queens'] -%}
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
--config-download
--deployed-server
{%- endif %}
{% if release not in ['newton','ocata','pike'] -%}
-e {{ working_dir }}/config-download.yaml
--disable-validations

View File

@ -54,6 +54,11 @@ overcloud_roles:
deploy_steps_ansible_workflow: true
config_download_args: >-
{% if release in ['queens'] -%}
-e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
--config-download
--deployed-server
{%- endif %}
{% if release not in ['newton','ocata','pike'] -%}
-e {{ working_dir }}/config-download.yaml
--disable-validations