Merge "set the correct config download settings for queens"

config/general_config/featureset016.yml

@@ -88,19 +88,24 @@ overcloud_roles:
       - Tenant
 
 deployed_server: >-
-  {% if release in ['newton','ocata','pike','queens'] -%}
+  {% if release in ['newton','ocata','pike'] -%}
   true
   {%- else -%}
   false
   {%- endif -%}
 deploy_steps_ansible_workflow: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
+  {% if release not in ['newton','ocata','pike'] -%}
   true
   {%- else -%}
   false
   {%- endif -%}
 config_download_args: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
+  {% 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
   --verbose

config/general_config/featureset017.yml

@@ -84,19 +84,24 @@ overcloud_roles:
       - Tenant
 
 deployed_server: >-
-  {% if release in ['newton','ocata','pike','queens'] -%}
+  {% if release in ['newton','ocata','pike'] -%}
   true
   {%- else -%}
   false
   {%- endif -%}
 deploy_steps_ansible_workflow: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
+  {% if release not in ['newton','ocata','pike'] -%}
   true
   {%- else -%}
   false
   {%- endif -%}
 config_download_args: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
+  {% 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
   --verbose

config/general_config/featureset018.yml

@@ -86,19 +86,24 @@ overcloud_roles:
       - Tenant
 
 deployed_server: >-
-  {% if release in ['newton','ocata','pike','queens'] -%}
+  {% if release in ['newton','ocata','pike'] -%}
   true
   {%- else -%}
   false
   {%- endif -%}
 deploy_steps_ansible_workflow: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
+  {% if release not in ['newton','ocata','pike'] -%}
   true
   {%- else -%}
   false
   {%- endif -%}
 config_download_args: >-
-  {% if release not in ['newton','ocata','pike','queens'] -%}
+  {% 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
   --verbose

config/general_config/featureset019.yml

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