openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Add ansible var to enable swift on undercloud"

This commit is contained in:
Zuul 2021-02-05 21:27:45 +00:00 committed by Gerrit Code Review
parent 53e2d4b493 c619e45f2d
commit d14052101e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/extras-common/defaults/main.yml
View File

@ -163,3 +163,9 @@ undercloud_enable_zaqar: >-
{%- else -%}
false
{%- endif %}
undercloud_enable_swift: >-
{% if release in ['queens', 'rocky', 'stein', 'train', 'ussuri', 'victoria'] -%}
true
{%- else -%}
false
{%- endif %}

3
roles/undercloud-deploy/templates/undercloud.conf.j2
View File

@ -257,6 +257,9 @@ enable_ironic_inspector = {{undercloud_enable_ironic_inspector}}
# Whether to install Zaqar in the Undercloud. (boolean value)
enable_zaqar = {{undercloud_enable_zaqar}}
# Whether to install Swift in the Undercloud. (boolean value)
enable_swift = {{undercloud_enable_swift}}
# Whether to enable Swift encryption at-rest or not. (boolean value)
enable_swift_encryption = {{undercloud_enable_swift_encryption}}