openstack/project-config
Code Issues Proposed changes

Fix nodepool after OpenDev changes

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

Change-Id: Ic52dcffcd9323c12410e05b1a3598911a28cbcaa
This commit is contained in:
Andreas Jaeger 2019-04-21 19:02:42 +02:00 committed by Andreas Jaeger
parent 530809fa47
commit 14eb58501b
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodepool/elements/cache-devstack/extra-data.d/55-cache-devstack-repos
View File

@ -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')

2
nodepool/elements/cache-devstack/extra-data.d/60-rm-early-source-repo
View File

@ -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

2
nodepool/elements/nodepool-base/README.rst
View File

@ -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
---------------

2
nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
View File

@ -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

2
nodepool/elements/nodepool-base/post-install.d/89-data-files
View File

@ -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/

2
playbooks/proposal/propose_update.sh
View File

@ -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
}

6
tools/build-image.sh
View File

@ -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'