Merge pull request #259 from Nordix/fix-bug-nam

Fix the issue that the OS is not a Stream version
metal3-io · May 3, 2021 · 631188e · 631188e
2 parents fd33e6e + 080a218
commit 631188e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/prepare-image.sh b/prepare-image.sh
@@ -3,7 +3,7 @@
 set -euxo pipefail
 
 dnf install -y python3 python3-requests
-curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/tripleo_repos/main.py | python3 - -b master current-tripleo
+curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/tripleo_repos/main.py | python3 - -b master current-tripleo --no-stream
 dnf upgrade -y
 xargs -rtd'\n' dnf --setopt=install_weak_deps=False install -y < /tmp/${PKGS_LIST}
 if [[ ! -z ${EXTRA_PKGS_LIST:-} ]]; then

diff --git a/scripts/ironic-common.sh b/scripts/ironic-common.sh
diff --git a/scripts/runmariadb b/scripts/runmariadb
@@ -17,6 +17,7 @@ if [ ! -f "$MARIADB_CERT_FILE" ] && [ -f "$MARIADB_KEY_FILE" ] ; then
 fi
 
 ln -sf /proc/self/fd/1 /var/log/mariadb/mariadb.log
+rm -f /usr/bin/mysqld_safe_helper # Avoid this script being used which results in a permission denied error.
 
 if [ ! -d "${DATADIR}/mysql" ]; then
     crudini --set "$MARIADB_CONF_FILE" mysqld max_connections 64