Merge "git: support git checkout for a commit hash"
diff --git a/.zuul.yaml b/.zuul.yaml
index fa7f180..316e89a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -370,7 +370,7 @@
- job:
name: devstack-base
- parent: multinode
+ parent: openstack-multinode-fips
abstract: true
description: |
Base abstract Devstack job.
@@ -1047,7 +1047,7 @@
# * neutron-functional-with-uwsgi: maintained by neutron for functional
# test. Next cycle we can remove this one if things turn out to be
# stable engouh with uwsgi.
- # * neutron-tempest-with-uwsgi: maintained by neutron for tempest test.
+ # * neutron-ovn-tempest-with-uwsgi: maintained by neutron for tempest test.
# Next cycle we can remove this if everything run out stable enough.
# * nova-multi-cell: maintained by nova and currently non-voting in the
# check queue for nova changes but relies on devstack configuration
@@ -1062,7 +1062,7 @@
- nova-next
- neutron-fullstack-with-uwsgi
- neutron-functional-with-uwsgi
- - neutron-tempest-with-uwsgi
+ - neutron-ovn-tempest-with-uwsgi
- devstack-plugin-ceph-tempest-py3:
irrelevant-files:
- ^.*\.rst$
diff --git a/functions-common b/functions-common
index d8b1502..63144d6 100644
--- a/functions-common
+++ b/functions-common
@@ -2499,6 +2499,11 @@
fi
}
+function is_fips_enabled {
+ fips=`cat /proc/sys/crypto/fips_enabled`
+ [ "$fips" == "1" ]
+}
+
# Restore xtrace
$_XTRACE_FUNCTIONS_COMMON
diff --git a/lib/databases/mysql b/lib/databases/mysql
index 00b02b3..27d1ec6 100644
--- a/lib/databases/mysql
+++ b/lib/databases/mysql
@@ -63,7 +63,7 @@
}
function configure_database_mysql {
- local my_conf mysql slow_log
+ local my_conf mysql slow_log my_client_conf
echo_summary "Configuring and starting MySQL"
if is_ubuntu; then
@@ -80,6 +80,15 @@
exit_distro_not_supported "mysql configuration"
fi
+ # Set fips mode on
+ if is_ubuntu; then
+ if is_fips_enabled; then
+ my_client_conf=/etc/mysql/mysql.conf.d/mysql.cnf
+ iniset -sudo $my_client_conf mysql ssl-fips-mode "on"
+ iniset -sudo $my_conf mysqld ssl-fips-mode "on"
+ fi
+ fi
+
# Change bind-address from localhost (127.0.0.1) to any (::)
iniset -sudo $my_conf mysqld bind-address "$(ipv6_unquote $SERVICE_LISTEN_ADDRESS)"