openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Use osp_release flag to set selinux mode"

Browse Source
This commit is contained in:
Zuul 2019-12-17 18:14:33 +00:00 committed by Gerrit Code Review
commit 768695d904
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/overcloud-deploy/defaults/main.yml
View File

@ -183,8 +183,8 @@ resource_registry_args:
# We disable selinux when running under CentOS. It's enabled for RHEL # We disable selinux when running under CentOS. It's enabled for RHEL
overcloud_selinux_enabled: >- overcloud_selinux_enabled: >-
{% if ansible_distribution == 'CentOS' -%} {% if osp_release is defined -%}
permissive
{%- else -%}
enforcing enforcing
{%- else -%}
permissive
{%- endif -%} {%- endif -%}

6
roles/undercloud-deploy/defaults/main.yml
View File

@ -85,10 +85,10 @@ default_undercloud_roles_data_path: "{{ undercloud_templates_path }}/roles_data_
# We disable selinux when running under CentOS. It's enabled for RHEL # We disable selinux when running under CentOS. It's enabled for RHEL
undercloud_selinux_enabled: >- undercloud_selinux_enabled: >-
{% if ansible_distribution == 'CentOS' -%} {% if osp_release is defined -%}
false
{%- else -%}
true true
{%- else -%}
false
{%- endif -%} {%- endif -%}
undercloud_container_cli: >- undercloud_container_cli: >-