From 905258d3233f5f5bf2864f7f65a11ae2fd24c3e0 Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Thu, 8 Feb 2018 18:36:37 -0500 Subject: [PATCH] Activate config-download only in Queens and beyond ... the feature doesn't work in Pike. Related-Bug: #1748315 Change-Id: I9c54f72e1b527ca68e88cc253c673362ca7943f1 --- config/general_config/featureset010.yml | 7 ++++++- config/general_config/featureset032.yml | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/config/general_config/featureset010.yml b/config/general_config/featureset010.yml index 3b60012e3..f39ded248 100644 --- a/config/general_config/featureset010.yml +++ b/config/general_config/featureset010.yml @@ -40,7 +40,12 @@ overcloud_roles: - StorageMgmt - Tenant -deploy_steps_ansible_workflow: true +deploy_steps_ansible_workflow: >- + {% if release not in ['newton','ocata','pike'] -%} + true + {%- else -%} + false + {%- endif -%} config_download_args: >- {% if release not in ['newton','ocata','pike'] -%} -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml diff --git a/config/general_config/featureset032.yml b/config/general_config/featureset032.yml index dbbd9c67a..2221e9c18 100644 --- a/config/general_config/featureset032.yml +++ b/config/general_config/featureset032.yml @@ -32,13 +32,18 @@ multinode_args: >- -e {{ overcloud_templates_path }}/environments/deployed-server-bootstrap-environment-centos.yaml --overcloud-ssh-user {{ undercloud_user }} -deploy_steps_ansible_workflow: true +deploy_steps_ansible_workflow: >- + {% if release not in ['newton','ocata','pike'] -%} + true + {%- else -%} + false + {%- endif -%} 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 - --deployed-server --config-download + --deployed-server --disable-validations --verbose {%- endif -%}