From 14eb58501bab53df01a8fd40105c0c86d4f74b5b Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 21 Apr 2019 19:02:42 +0200
Subject: [PATCH] Fix nodepool after OpenDev changes

Fix a couple of places where orgs where renamed so that dib finds the
repos.

Change-Id: Ic52dcffcd9323c12410e05b1a3598911a28cbcaa
---
 .../cache-devstack/extra-data.d/55-cache-devstack-repos     | 2 +-
 .../cache-devstack/extra-data.d/60-rm-early-source-repo     | 2 +-
 nodepool/elements/nodepool-base/README.rst                  | 2 +-
 .../nodepool-base/extra-data.d/99-copy-nodepool-scripts     | 2 +-
 .../elements/nodepool-base/post-install.d/89-data-files     | 2 +-
 playbooks/proposal/propose_update.sh                        | 2 +-
 tools/build-image.sh                                        | 6 +++---
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos b/nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos
index 7df0194366..f485674df8 100755
--- a/nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos
+++ b/nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos
@@ -25,7 +25,7 @@ import subprocess
 TMP_MOUNT_PATH = os.environ['TMP_MOUNT_PATH']
 TMP_HOOKS_PATH = os.environ['TMP_HOOKS_PATH']
 
-DEVSTACK = os.path.join(TMP_MOUNT_PATH, 'opt/git/openstack-dev/devstack')
+DEVSTACK = os.path.join(TMP_MOUNT_PATH, 'opt/git/openstack/devstack')
 CACHEDIR = os.path.join(TMP_MOUNT_PATH, 'tmp')
 IMAGES = os.path.join(TMP_HOOKS_PATH, 'source-repository-images')
 
diff --git a/nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo b/nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo
index 71b529f837..ea7ac7ac90 100755
--- a/nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo
+++ b/nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo
@@ -26,4 +26,4 @@ if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
 fi
 set -eu
 
-sudo rm -rf $TMP_MOUNT_PATH/opt/git/openstack-dev/devstack
+sudo rm -rf $TMP_MOUNT_PATH/opt/git/openstack/devstack
diff --git a/nodepool/elements/nodepool-base/README.rst b/nodepool/elements/nodepool-base/README.rst
index 5dec06ee4a..5b615c0091 100644
--- a/nodepool/elements/nodepool-base/README.rst
+++ b/nodepool/elements/nodepool-base/README.rst
@@ -9,7 +9,7 @@ Environment variables:
 ``NODEPOOL_SCRIPTDIR`` path to copy Nodepool scripts from. It is set
 automatically by Nodepool.  For local hacking override it to where your scripts
 are. Default:
-``$TMP_MOUNT_PATH/opt/git/openstack-infra/project-config/nodepool/scripts``.
+``$TMP_MOUNT_PATH/opt/git/openstack/project-config/nodepool/scripts``.
 
 Name resolution
 ---------------
diff --git a/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts b/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
index e1ce4bbf98..c4f5fb56ae 100755
--- a/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
+++ b/nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
@@ -33,7 +33,7 @@ fi
 set -eu
 set -o pipefail
 
-NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-$TMP_MOUNT_PATH/opt/git/openstack-infra/project-config/nodepool/scripts}
+NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-$TMP_MOUNT_PATH/opt/git/openstack/project-config/nodepool/scripts}
 
 sudo cp -a $NODEPOOL_SCRIPTDIR $TMP_MOUNT_PATH/opt/nodepool-scripts
 sudo chmod -R a+rx $TMP_MOUNT_PATH/opt/nodepool-scripts
diff --git a/nodepool/elements/nodepool-base/post-install.d/89-data-files b/nodepool/elements/nodepool-base/post-install.d/89-data-files
index b46f2ba4fc..0172cd4563 100755
--- a/nodepool/elements/nodepool-base/post-install.d/89-data-files
+++ b/nodepool/elements/nodepool-base/post-install.d/89-data-files
@@ -24,5 +24,5 @@ set -eu
 set -o pipefail
 
 mkdir -p /usr/local/bindep-fallback
-cp -a /opt/git/openstack-infra/project-config/nodepool/elements/bindep-fallback.txt \
+cp -a /opt/git/openstack/project-config/nodepool/elements/bindep-fallback.txt \
     /usr/local/bindep-fallback/
diff --git a/playbooks/proposal/propose_update.sh b/playbooks/proposal/propose_update.sh
index 7877beca7c..9c7f648300 100755
--- a/playbooks/proposal/propose_update.sh
+++ b/playbooks/proposal/propose_update.sh
@@ -45,7 +45,7 @@ elif [ "$OWN_PROJECT" == "requirements-constraints" ] ; then
 elif [ "$OWN_PROJECT" == "devstack-plugins-list" ] ; then
     INITIAL_COMMIT_MSG="Updated from generate-devstack-plugins-list"
     TOPIC="openstack/devstack/plugins"
-    PROJECTS=openstack-dev/devstack
+    PROJECTS=openstack/devstack
     function update {
         bash -ex tools/generate-devstack-plugins-list.sh $1
     }
diff --git a/tools/build-image.sh b/tools/build-image.sh
index bd5c591c4e..c03be23ef5 100755
--- a/tools/build-image.sh
+++ b/tools/build-image.sh
@@ -82,9 +82,9 @@ fi
 
 ## add to /tmp/custom_projects.yaml:
 ##
-## - project: openstack-infra/project-config
-## - project: openstack-infra/system-config
-## - project: openstack-dev/devstack
+## - project: openstack/project-config
+## - project: openstack/system-config
+## - project: openstack/devstack
 ## - project: openstack/tempest
 
 # export DIB_CUSTOM_PROJECTS_LIST_URL='file:///tmp/custom_projects.yaml'