openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "Fix queens fs016 fs019"

This commit is contained in:
Zuul 2018-09-04 13:52:00 +00:00 committed by Gerrit Code Review
parent 87e7ab931f a0aad6e280
commit 72ed49fe8c
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