summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlawek Kaplonski <skaplons@redhat.com>2022-03-10 21:57:19 +0100
committerSlawek Kaplonski <skaplons@redhat.com>2022-03-11 16:02:22 +0100
commitd8c76db952d0dc1d708aee4693beb14e1019fd2c (patch)
tree468ab50edd65a19b05f25fff66ae470b038c6c93
parent79e6125dc01dd72437fde9cac17c2d3d1627e616 (diff)
downloadneutron-d8c76db952d0dc1d708aee4693beb14e1019fd2c.tar.gz
Run configure_for_func_testing script after enable fips
It should be run after FIPS are enabled and node is rebooted to make sure that openvswitch is running properly during tests. Change-Id: I35411f177a432985795940947fd5440d8f929251
-rw-r--r--playbooks/configure_functional_job.yaml6
-rw-r--r--zuul.d/base.yaml4
2 files changed, 8 insertions, 2 deletions
diff --git a/playbooks/configure_functional_job.yaml b/playbooks/configure_functional_job.yaml
index d44c4febd7..4d732cc641 100644
--- a/playbooks/configure_functional_job.yaml
+++ b/playbooks/configure_functional_job.yaml
@@ -5,4 +5,10 @@
# destination IP addresses in arp tables:
- legacy_ebtables
- setup_logdir
+ - role: persistent-firewall
+ when: enable_fips is defined and enable_fips|bool
+ - role: enable-fips
+ when: enable_fips is defined and enable_fips|bool
+ - role: disable_selinux
+ when: enable_fips is defined and enable_fips|bool
- configure_functional_tests
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index c88240b650..64e254ba66 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -138,8 +138,8 @@
nodeset: devstack-single-node-centos-8-stream
description: |
Functional testing for a FIPS enabled Centos 8 system
- pre-run: playbooks/enable-fips.yaml
vars:
+ enable_fips: True
configure_swap_size: 4096
devstack_localrc:
ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256
@@ -151,8 +151,8 @@
nodeset: devstack-single-node-centos-8-stream
description: |
Functional testing for a FIPS enabled Centos 8 system
- pre-run: playbooks/enable-fips.yaml
vars:
+ enable_fips: True
configure_swap_size: 4096
devstack_localrc:
ISCSI_CHAP_ALGORITHMS: SHA3-256,SHA256