From 77f747af7ae0d005d74b621d8773f4d255a13106 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 24 Oct 2017 09:15:34 -0700
Subject: [PATCH] fs010: use --config-download from tripleoclient

See https://review.openstack.org/#/c/514701/ for the context.
This is a new iteration of testing config-download.

Change-Id: I18815c9920454290d965ef632a29ee13c718cd0d
Implements: ansible-config-download-ci
Depends-On: If23e223b4a0387efcc745d02154c6bdd2dee23fc
Depends-On: Iff7a1b211a545f1227b9e13e304b858128fb855b
Depends-On: I20d4107eed4c92b891e3b2dc749b8aeedfe4ef75
---
 config/general_config/featureset010.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml
index 2c7b6c6d2..47095ebf7 100644
--- a/config/general_config/featureset010.yml
+++ b/config/general_config/featureset010.yml
@@ -33,20 +33,15 @@ overcloud_roles:
       - StorageMgmt
       - Tenant
 
-step_tripleo_config_download: >-
-  {% if release not in ['newton','ocata','pike'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
-deploy_steps_ansible: >-
-  {% if release not in ['newton','ocata','pike'] -%}
-  true
-  {%- else -%}
-  false
-  {%- endif -%}
+step_tripleo_config_download: false
+deploy_steps_ansible: false
+deploy_steps_ansible_workflow: true
 config_download_args: >-
   {% if release not in ['newton','ocata','pike'] -%}
   -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml
   -e {{ working_dir }}/config-download.yaml
+  --config-download
+  --deployed-server
+  --disable-validations
+  --verbose
   {%- endif -%}