opendev
/
system-config
Code Issues Proposed changes

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
This commit is contained in:
Spencer Krum 2015-11-06 09:57:34 -08:00
parent aa80004e68
commit 8cdaf92609
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install_modules.sh
View File

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

2
modules.env
View File

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

4
tools/apply-test.sh
View File

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