openstack/devstack
Code Issues Proposed changes

Don't clone dib-utils in install_heat

Browse Source 
It's not used, and a recent change to trim down projects lists in
devstack-gate broke devstack in the gate that enabled heat.

Change-Id: I405423bdc9ba8dd9b30fce6fdceacccf662d5da3
This commit is contained in:
Monty Taylor 2016-10-18 07:24:00 -05:00
parent 093d815d9f
commit 201c01f19b
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/heat
View File

@ -40,7 +40,6 @@ HEAT_DIR=$DEST/heat
HEAT_CFNTOOLS_DIR=$DEST/heat-cfntools HEAT_CFNTOOLS_DIR=$DEST/heat-cfntools
HEAT_TEMPLATES_REPO_DIR=$DEST/heat-templates HEAT_TEMPLATES_REPO_DIR=$DEST/heat-templates
OCC_DIR=$DEST/os-collect-config OCC_DIR=$DEST/os-collect-config
DIB_UTILS_DIR=$DEST/dib-utils
ORC_DIR=$DEST/os-refresh-config ORC_DIR=$DEST/os-refresh-config
OAC_DIR=$DEST/os-apply-config OAC_DIR=$DEST/os-apply-config
@ -276,7 +275,6 @@ function install_heat_other {
git_clone $OAC_REPO $OAC_DIR $OAC_BRANCH git_clone $OAC_REPO $OAC_DIR $OAC_BRANCH
git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH
git_clone $ORC_REPO $ORC_DIR $ORC_BRANCH git_clone $ORC_REPO $ORC_DIR $ORC_BRANCH
git_clone $DIB_UTILS_REPO $DIB_UTILS_DIR $DIB_UTILS_BRANCH
} }
# start_heat() - Start running processes, including screen # start_heat() - Start running processes, including screen
@ -420,7 +418,7 @@ function create_heat_accounts {
# build_heat_pip_mirror() - Build a pip mirror containing heat agent projects # build_heat_pip_mirror() - Build a pip mirror containing heat agent projects
function build_heat_pip_mirror { function build_heat_pip_mirror {
local project_dirs="$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR $DIB_UTILS_DIR" local project_dirs="$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR"
local projpath proj package local projpath proj package
rm -rf $HEAT_PIP_REPO rm -rf $HEAT_PIP_REPO