openstack/project-config
Code Issues Proposed changes

Merge "Update nodepool for OpenDev"

Browse Source
This commit is contained in:
Zuul
2019-04-20 17:36:36 +00:00
committed by Gerrit Code Review
parent ebaea68ccc f43766da84
commit 99e8a23109
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nodepool/elements/cache-devstack/extra-data.d/50-early-source-repo
View File

@@ -42,8 +42,8 @@ function get_devstack_from_cache {
local REPONAME=devstack local REPONAME=devstack
local REPOTYPE=git local REPOTYPE=git
local REPOPATH=/opt/git/openstack-dev/devstack local REPOPATH=/opt/git/openstack/devstack
local REPOLOCATION=https://git.openstack.org/openstack-dev/devstack.git local REPOLOCATION=https://opendev.org/openstack/devstack.git
local REPOREF=master local REPOREF=master
local REPO_DEST=$TMP_MOUNT_PATH$REPOPATH local REPO_DEST=$TMP_MOUNT_PATH$REPOPATH

2
nodepool/elements/nodepool-base/finalise.d/89-unbound
View File

@@ -28,7 +28,7 @@ set -e
# forwarder setup is only relevant to the initial boot and some parts # forwarder setup is only relevant to the initial boot and some parts
# of the integration-tests before configure-unbound role is used. # of the integration-tests before configure-unbound role is used.
# #
# [1] http://git.openstack.org/cgit/opendev/base-jobs/tree/roles/configure-unbound # [1] https://opendev.org/opendev/base-jobs/src/branch/master/roles/configure-unbound
# #
NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-1.1.1.1} NODEPOOL_STATIC_NAMESERVER_V4=${NODEPOOL_STATIC_NAMESERVER_V4:-1.1.1.1}

2
nodepool/elements/openstack-repos/README.rst
View File

@@ -12,7 +12,7 @@ DIB_CUSTOM_PROJECTS_LIST_URL
:Default: None :Default: None
:Description: Url to a yaml file contains custom list of repos. :Description: Url to a yaml file contains custom list of repos.
The custom yaml file has the same structure as the default file: The custom yaml file has the same structure as the default file:
'https://git.openstack.org/cgit/openstack-infra/project-config/plain/gerrit/projects.yaml' 'https://opendev.org/openstack/project-config/raw/gerrit/projects.yaml'
Download only the repos that appear in the custom file rather than Download only the repos that appear in the custom file rather than
downloading all openstack repos that appear in the default file. downloading all openstack repos that appear in the default file.
:Example: :Example:

6
nodepool/elements/openstack-repos/extra-data.d/50-create-repo-list
View File

@@ -24,13 +24,13 @@ import yaml
from six.moves.urllib.request import urlopen from six.moves.urllib.request import urlopen
from six.moves.urllib.error import URLError from six.moves.urllib.error import URLError
URL = ('https://git.openstack.org/cgit/openstack-infra/project-config/' URL = ('https://opendev.org/openstack/project-config/'
'plain/gerrit/projects.yaml') 'raw/gerrit/projects.yaml')
TMP_HOOKS_PATH = os.environ['TMP_HOOKS_PATH'] TMP_HOOKS_PATH = os.environ['TMP_HOOKS_PATH']
PROJECTS_REPOS = os.path.join(TMP_HOOKS_PATH, PROJECTS_REPOS = os.path.join(TMP_HOOKS_PATH,
'source-repository-projects-yaml') 'source-repository-projects-yaml')
GIT_BASE = os.environ.get('GIT_BASE', 'https://git.openstack.org') GIT_BASE = os.environ.get('GIT_BASE', 'https://opendev.org')
CUSTOM_PROJECTS_LIST_URL = os.environ.get('DIB_CUSTOM_PROJECTS_LIST_URL') CUSTOM_PROJECTS_LIST_URL = os.environ.get('DIB_CUSTOM_PROJECTS_LIST_URL')