From d9798d288a6f7871b7302c428c6c6651884dfd63 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 21 Feb 2014 19:05:34 +0000 Subject: [PATCH] Nodepool should clone the config repo from git.o.o * .../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 --- .../openstack_project/files/nodepool/scripts/cache_git_repos.py | 2 +- .../openstack_project/files/nodepool/scripts/prepare_node.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/nodepool/scripts/cache_git_repos.py b/modules/openstack_project/files/nodepool/scripts/cache_git_repos.py index c2ebfe4af9..917e6600d1 100755 --- a/modules/openstack_project/files/nodepool/scripts/cache_git_repos.py +++ b/modules/openstack_project/files/nodepool/scripts/cache_git_repos.py @@ -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+(.*)$') diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh index 9e092acfbb..5b82cb35e4 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh @@ -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