openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow deployments to run when selinux is disabled"

Browse Source
This commit is contained in:
Zuul 2022-02-17 01:49:56 +00:00 committed by Gerrit Code Review
commit 3b0ffcd9d6
21 changed files with 64 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/barbican/barbican-api-container-puppet.yaml
View File

@ -803,6 +803,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
scale_tasks:
if:
- {get_param: BarbicanPkcs11CryptoLunasaEnabled}

3
deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
View File

@ -139,3 +139,6 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"

3
deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
View File

@ -220,6 +220,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
external_upgrade_tasks:
- when:
- step|int == 1

3
deployment/cinder/cinder-backup-container-puppet.yaml
View File

@ -282,6 +282,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
deploy_steps_tasks:
- name: Clean up when switching cinder-backup from pcmk to active-active
when:

3
deployment/cinder/cinder-scheduler-container-puppet.yaml
View File

@ -163,6 +163,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
external_upgrade_tasks:
- when:
- step|int == 1

3
deployment/deprecated/nova/nova-libvirt-container-puppet.yaml
View File

@ -925,6 +925,9 @@ outputs:
name: os_enable_vtpm
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
metadata_settings:
list_concat:
- if:

3
deployment/heat/heat-engine-container-puppet.yaml
View File

@ -305,6 +305,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
upgrade_tasks: []
external_upgrade_tasks:
- when:

3
deployment/logrotate/logrotate-crond-container-puppet.yaml
View File

@ -113,6 +113,9 @@ outputs:
name: logrotate_read_inside_containers
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
deploy_steps_tasks:
- name: configure tmpwatch on the host
when: step|int == 2

3
deployment/manila/manila-scheduler-container-puppet.yaml
View File

@ -128,6 +128,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
upgrade_tasks: []
external_upgrade_tasks:
- when:

3
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -428,6 +428,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
- name: set conditions
set_fact:
dnsmasq_wrapper_enabled: {get_param: NeutronEnableDnsmasqDockerWrapper}

3
deployment/neutron/neutron-l3-container-puppet.yaml
View File

@ -355,6 +355,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
- name: set conditions
set_fact:
keepalived_wrapper_enabled: {get_param: NeutronEnableKeepalivedWrapper}

3
deployment/neutron/neutron-metadata-container-puppet.yaml
View File

@ -211,4 +211,7 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
upgrade_tasks: []

3
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -418,6 +418,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
update_tasks:
# puppetlabs-firewall manages security rules via Puppet but make the rules
# consistent by default. Since Neutron also creates some rules, we don't

3
deployment/neutron/neutron-sriov-agent-container-puppet.yaml
View File

@ -202,6 +202,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
- if:
- derive_pci_whitelist_enabled
- - name: "creating directory"

3
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -1532,6 +1532,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
- name: install Instance HA recovery script
when: instance_ha_enabled|bool
block:

3
deployment/nova/nova-conductor-container-puppet.yaml
View File

@ -242,6 +242,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
external_upgrade_tasks:
- when: step|int == 1
block: &nova_online_db_migration

3
deployment/nova/nova-ironic-container-puppet.yaml
View File

@ -230,6 +230,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
external_post_deploy_tasks: {get_attr: [NovaComputeCommon, nova_compute_common_deploy_steps_tasks]}
external_upgrade_tasks:
- when:

3
deployment/nova/nova-modular-libvirt-container-puppet.yaml
View File

@ -963,6 +963,9 @@ outputs:
name: os_enable_vtpm
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
metadata_settings:
list_concat:
- if:

3
deployment/nova/nova-scheduler-container-puppet.yaml
View File

@ -323,6 +323,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
external_upgrade_tasks:
- when:
- step|int == 1

3
deployment/octavia/octavia-worker-container-puppet.yaml
View File

@ -179,6 +179,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
update_tasks: {get_attr: [OctaviaBase, role_data, update_tasks]}
upgrade_tasks: {get_attr: [OctaviaBase, role_data, upgrade_tasks]}
external_upgrade_tasks:

5
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -277,7 +277,7 @@ outputs:
- 'ssl'
vswitch::ovs::vlan_limit:
if:
- {get_param: EnableVLANTransparency}
- {get_param: EnableVLANTransparency}
- 0
service_config_settings: {}
# BEGIN DOCKER SETTINGS
@ -426,6 +426,9 @@ outputs:
name: virt_sandbox_use_netlink
persistent: true
state: true
when:
- ansible_facts.selinux is defined
- ansible_facts.selinux.status == "enabled"
- name: Copy in cleanup script
copy:
content: {get_file: ../neutron/neutron-cleanup}