Allow deployments to run when selinux is disabled
This change will allow the generated playbooks to run when selinux is disabled. Presently the seboolean module will fail when a systems has selinux disabled. While selinux could be set permissive to avoid an error, the disabled setting is a valid configuration and should be respected. > seboolean will now only run when selinux is enabled. Change-Id: Ifd31adcf27902a8a77de9c68482306ec9da6d250 Signed-off-by: Kevin Carter <kecarter@redhat.com>
This commit is contained in:
parent
557a392c9a
commit
7e8d88afa5
@ -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}
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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: []
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -1525,6 +1525,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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -271,7 +271,7 @@ outputs:
|
||||
- 'ssl'
|
||||
vswitch::ovs::vlan_limit:
|
||||
if:
|
||||
- {get_param: EnableVLANTransparency}
|
||||
- {get_param: EnableVLANTransparency}
|
||||
- 0
|
||||
service_config_settings: {}
|
||||
# BEGIN DOCKER SETTINGS
|
||||
@ -420,6 +420,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}
|
||||
|
Loading…
Reference in New Issue
Block a user