openstack
/
tripleo-quickstart
Code Issues Proposed changes

Fix queens fs016 fs019 

In queens, the ceph-ansible workflow does not work with config download.
These jobs should not be using config-download.  This was improperly
converted as part of I881f92e6cef4de58a9731f03669e42bc862964ec. This is
a partial revert of that patch for featureset016 and featureset019.  The
featureset documentation indicates that these are not configured with
config download.

https://docs.openstack.org/tripleo-quickstart/latest/feature-configuration.html

Change-Id: Ib6c3ca7886c5e4adb0883c501bfbb390e15d108f
Closes-Bug: #1790144
Related-Bug: #1789416
This commit is contained in:
Alex Schultz 2018-08-31 16:21:56 -06:00
parent b3089c2c74
commit a0aad6e280
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/general_config/featureset016.yml
View File

@ -88,24 +88,19 @@ overcloud_roles:
- Tenant
deployed_server: >-
{% if release in ['newton','ocata','pike'] -%}
{% if release in ['newton','ocata','pike','queens'] -%}
true
{%- else -%}
false
{%- endif -%}
deploy_steps_ansible_workflow: >-
{% if release not in ['newton','ocata','pike'] -%}
{% if release not in ['newton','ocata','pike','queens'] -%}
true
{%- else -%}
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'] -%}
{% if release not in ['newton','ocata','pike','queens'] -%}
-e {{ working_dir }}/config-download.yaml
--disable-validations
--verbose

11
config/general_config/featureset019.yml
View File

@ -80,24 +80,19 @@ overcloud_roles:
- Tenant
deployed_server: >-
{% if release in ['newton','ocata','pike'] -%}
{% if release in ['newton','ocata','pike','queens'] -%}
true
{%- else -%}
false
{%- endif -%}
deploy_steps_ansible_workflow: >-
{% if release not in ['newton','ocata','pike'] -%}
{% if release not in ['newton','ocata','pike','queens'] -%}
true
{%- else -%}
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'] -%}
{% if release not in ['newton','ocata','pike','queens'] -%}
-e {{ working_dir }}/config-download.yaml
--disable-validations
--verbose