Merge "Add OpenStack two nodes nodeset for Centos 9"
diff --git a/functions-common b/functions-common
index b2cf9d9..8651604 100644
--- a/functions-common
+++ b/functions-common
@@ -673,6 +673,18 @@
fi
fi
+ # NOTE(ianw) 2022-04-13 : commit [1] has broken many assumptions
+ # about how we clone and work with repos. Mark them safe globally
+ # as a work-around.
+ #
+ # NOTE(danms): On bionic (and likely others) git-config may write
+ # ~stackuser/.gitconfig if not run with sudo -H. Using --system
+ # writes these changes to /etc/gitconfig which is more
+ # discoverable anyway.
+ #
+ # [1] https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9
+ sudo git config --system --add safe.directory ${git_dest}
+
# print out the results so we know what change was used in the logs
cd $git_dest
git show --oneline | head -1
diff --git a/stack.sh b/stack.sh
index 0082b99..6e9ced9 100755
--- a/stack.sh
+++ b/stack.sh
@@ -67,7 +67,9 @@
umask 022
# Not all distros have sbin in PATH for regular users.
-PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin
+# osc will normally be installed at /usr/local/bin/openstack so ensure
+# /usr/local/bin is also in the path
+PATH=$PATH:/usr/local/bin:/usr/local/sbin:/usr/sbin:/sbin
# Keep track of the DevStack directory
TOP_DIR=$(cd $(dirname "$0") && pwd)
diff --git a/unstack.sh b/unstack.sh
index 4b57b6e..813f9a8 100755
--- a/unstack.sh
+++ b/unstack.sh
@@ -181,3 +181,8 @@
clean_pyc_files
rm -Rf $DEST/async
+
+# Clean any safe.directory items we wrote into the global
+# gitconfig. We can identify the relevant ones by checking that they
+# point to somewhere in our $DEST directory.
+sudo sed -i "/directory=${DEST}/ d" /etc/gitconfig