From 2e676f23619fe95088ec8562c121da8898126e5a Mon Sep 17 00:00:00 2001 From: Rick van de Loo Date: Sun, 13 Oct 2024 11:33:52 +0200 Subject: [PATCH 1/2] Revert "do not use local openstack mirror" --- saltstack/salt/files/usr/local/bin/configure_openstack.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/saltstack/salt/files/usr/local/bin/configure_openstack.sh b/saltstack/salt/files/usr/local/bin/configure_openstack.sh index 41d5dd1..7899ed9 100755 --- a/saltstack/salt/files/usr/local/bin/configure_openstack.sh +++ b/saltstack/salt/files/usr/local/bin/configure_openstack.sh @@ -12,6 +12,9 @@ cd devstack git fetch git checkout stable/2023.1 GIT_BASE_IF_NEEDED="" +if [ -d /mnt/storage/openstack ]; then + GIT_BASE_IF_NEEDED="GIT_BASE=file:///mnt/storage/openstack" +fi cat << EOF > local.conf [[local|localrc]] $GIT_BASE_IF_NEEDED From bb024dd6d874baa6fb27054e081ea826b3e34c88 Mon Sep 17 00:00:00 2001 From: Rick van de Loo Date: Sun, 13 Oct 2024 15:43:03 +0200 Subject: [PATCH 2/2] allow local openstack repos as safe.directories --- saltstack/salt/files/usr/local/bin/configure_openstack.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/saltstack/salt/files/usr/local/bin/configure_openstack.sh b/saltstack/salt/files/usr/local/bin/configure_openstack.sh index 7899ed9..b07360c 100755 --- a/saltstack/salt/files/usr/local/bin/configure_openstack.sh +++ b/saltstack/salt/files/usr/local/bin/configure_openstack.sh @@ -14,6 +14,7 @@ git checkout stable/2023.1 GIT_BASE_IF_NEEDED="" if [ -d /mnt/storage/openstack ]; then GIT_BASE_IF_NEEDED="GIT_BASE=file:///mnt/storage/openstack" + git config --global --add safe.directory '*' fi cat << EOF > local.conf [[local|localrc]]