Merge "Add config-download back into queens CI"

config/general_config/featureset001.yml

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

config/general_config/featureset010.yml

@@ -62,6 +62,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

config/general_config/featureset026.yml

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

config/general_config/featureset032.yml

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

config/general_config/featureset037.yml

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