From 8cdaf926093baa794ce2275dc70b18020e8caee5 Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Fri, 6 Nov 2015 09:57:34 -0800
Subject: [PATCH] Treat openstack_health normally
This is a partial revert of 05c16e2e that removes special casing around
the openstack-health/openstack_health repo.
Change-Id: I832f1b764a34c128d737a467fa568cc064226c5a
---
install_modules.sh | 10 +++-------
modules.env | 2 +-
tools/apply-test.sh | 4 ----
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/install_modules.sh b/install_modules.sh
index 9f40caa69c..9934d7cd4e 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -89,13 +89,9 @@ for MOD in ${!SOURCE_MODULES[*]} ; do
echo "Remote repos of the form repo.git are not supported: ${MOD}"
exit 1
fi
- # NOTE(mtreinish): hack around incorrectly named openstack-health,
- # remove after the gerrit rename
- if [[ `echo $MOD | grep -c 'openstack-health'` -eq 1 ]]; then
- MODULE_NAME="openstack_health"
- else
- MODULE_NAME=`echo $MOD | awk -F- '{print $NF}'`
- fi
+
+ MODULE_NAME=`echo $MOD | awk -F- '{print $NF}'`
+
# set up git base command to use the correct path
GIT_CMD_BASE="git --git-dir=${MODULE_PATH}/${MODULE_NAME}/.git --work-tree ${MODULE_PATH}/${MODULE_NAME}"
# treat any occurrence of the module as a match
diff --git a/modules.env b/modules.env
index 9fea6f6a48..0eed4c463e 100644
--- a/modules.env
+++ b/modules.env
@@ -106,7 +106,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-mysql_backup"]="
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-nodepool"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-odsreg"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openafs"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstack-health"]="origin/master"
+INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstack_health"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstackci"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-openstackid"]="origin/master"
INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/openstack-infra/puppet-os_client_config"]="origin/master"
diff --git a/tools/apply-test.sh b/tools/apply-test.sh
index dc2cce26fd..bc2906ea7f 100755
--- a/tools/apply-test.sh
+++ b/tools/apply-test.sh
@@ -57,14 +57,10 @@ for MOD in ${!INTEGRATION_MODULES[*]}; do
project_names+=" $project_scope/$repo_name"
done
-project_names+=" openstack-infra/puppet-openstack-health"
-
sudo -E /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
git://git.openstack.org \
$project_names
-sudo mv /etc/puppet/modules/openstack-health /etc/puppet/modules/openstack_health
-
if [[ ! -d applytest ]] ; then
mkdir applytest
fi