opendev/system-config
Code Issues Proposed changes

Nodepool should clone the config repo from git.o.o

Browse Source 
* .../nodepool/scripts/cache_git_repos.py: Since the projects list
is not being retrieved as part of a git repository, use HTTPS
protocol rather than HTTP so it will be consistent with the way we
retrieve the bootstrap script in prepare_node.sh.

* .../nodepool/scripts/prepare_node.sh: Switch the config clone
operation from the Gerrit server to the Git server farm, since the
former does not support git protocol. Also make it a shallow clone
since we just need the files.

Change-Id: I1dc0697bb3f9832d180b6b1ebffaa563bd886281
This commit is contained in:
Jeremy Stanley 2014-02-21 19:05:34 +00:00
parent 4c9ca0597b
commit d9798d288a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/files/nodepool/scripts/cache_git_repos.py
View File

@ -23,7 +23,7 @@ import urllib2
from common import run_local
URL = ('http://git.openstack.org/cgit/openstack-infra/config/plain/'
URL = ('https://git.openstack.org/cgit/openstack-infra/config/plain/'
'modules/openstack_project/files/review.projects.yaml')
PROJECT_RE = re.compile('^-?\s+project:\s+(.*)$')

2
modules/openstack_project/files/nodepool/scripts/prepare_node.sh
View File

@ -25,7 +25,7 @@ PYPY=${5:-false}
sudo hostname $HOSTNAME
wget https://git.openstack.org/cgit/openstack-infra/config/plain/install_puppet.sh
sudo bash -xe install_puppet.sh
sudo git clone git://review.openstack.org/p/openstack-infra/config.git \
sudo git clone --depth=1 git://git.openstack.org/openstack-infra/config.git \
/root/config
sudo /bin/bash /root/config/install_modules.sh
if [ -z "$NODEPOOL_SSH_KEY" ] ; then