Add selinux configuration for OVB jobs
Add template with selinux config and disable it for CentOS in CI. Co-Author: Ronelle Landy <rlandy@redhat.com> Closes-Bug: #1821744 Change-Id: I9b1143152e4e120c1c1aff8f4a7882a4799eb776
This commit is contained in:
parent
242d35e312
commit
1e01fc2003
@ -104,6 +104,7 @@ multinode_args: ""
|
|||||||
ovn_args: ""
|
ovn_args: ""
|
||||||
telemetry_args: ""
|
telemetry_args: ""
|
||||||
config_download_args: ""
|
config_download_args: ""
|
||||||
|
selinux_args: ""
|
||||||
|
|
||||||
deploy_args: >-
|
deploy_args: >-
|
||||||
{{ libvirt_args }}
|
{{ libvirt_args }}
|
||||||
@ -130,6 +131,7 @@ deploy_args: >-
|
|||||||
{{ composable_args }}
|
{{ composable_args }}
|
||||||
{{ topology }}
|
{{ topology }}
|
||||||
{{ config_download_args }}
|
{{ config_download_args }}
|
||||||
|
{{ selinux_args }}
|
||||||
{{ extra_args }}
|
{{ extra_args }}
|
||||||
|
|
||||||
composable_roles: false
|
composable_roles: false
|
||||||
@ -174,3 +176,10 @@ resource_registry_args:
|
|||||||
# Used to deploy podman on the undercloud instead of docker
|
# Used to deploy podman on the undercloud instead of docker
|
||||||
# TODO(emilien) in Stein, we'll switch the default to podman
|
# TODO(emilien) in Stein, we'll switch the default to podman
|
||||||
overcloud_container_cli: docker
|
overcloud_container_cli: docker
|
||||||
|
# We disable selinux when running under CentOS. It's enabled for RHEL
|
||||||
|
overcloud_selinux_enabled: >-
|
||||||
|
{% if ansible_distribution == 'CentOS' -%}
|
||||||
|
permissive
|
||||||
|
{%- else -%}
|
||||||
|
enforcing
|
||||||
|
{%- endif -%}
|
||||||
|
@ -73,3 +73,8 @@
|
|||||||
template:
|
template:
|
||||||
src: "ansible.cfg.j2"
|
src: "ansible.cfg.j2"
|
||||||
dest: "{{ working_dir }}/custom_ansible.cfg"
|
dest: "{{ working_dir }}/custom_ansible.cfg"
|
||||||
|
|
||||||
|
- name: Create selinux configuration for overcloud
|
||||||
|
template:
|
||||||
|
src: "overcloud-selinux-config.yaml.j2"
|
||||||
|
dest: "{{ working_dir }}/overcloud-selinux-config.yaml"
|
||||||
|
@ -277,3 +277,8 @@
|
|||||||
when:
|
when:
|
||||||
- ci_job_end_time is defined
|
- ci_job_end_time is defined
|
||||||
- '"ovb" not in lookup("env", "TOCI_JOBTYPE")'
|
- '"ovb" not in lookup("env", "TOCI_JOBTYPE")'
|
||||||
|
|
||||||
|
- name: Set the selinux args
|
||||||
|
set_fact:
|
||||||
|
selinux_args: >-
|
||||||
|
-e {{ working_dir }}/overcloud-selinux-config.yaml
|
||||||
|
@ -0,0 +1,2 @@
|
|||||||
|
parameter_defaults:
|
||||||
|
SELinuxMode: '{{ overcloud_selinux_enabled }}'
|
Loading…
Reference in New Issue
Block a user