diff --git a/lib/heat b/lib/heat index f69e803c11..c7abd3bb1c 100644 --- a/lib/heat +++ b/lib/heat @@ -36,6 +36,7 @@ HEAT_DIR=$DEST/heat HEAT_CFNTOOLS_DIR=$DEST/heat-cfntools HEAT_TEMPLATES_REPO_DIR=$DEST/heat-templates OCC_DIR=$DEST/os-collect-config +DIB_UTILS_DIR=$DEST/dib-utils ORC_DIR=$DEST/os-refresh-config OAC_DIR=$DEST/os-apply-config @@ -216,6 +217,10 @@ function install_heat { function install_heat_other { git_clone $HEAT_CFNTOOLS_REPO $HEAT_CFNTOOLS_DIR $HEAT_CFNTOOLS_BRANCH git_clone $HEAT_TEMPLATES_REPO $HEAT_TEMPLATES_REPO_DIR $HEAT_TEMPLATES_BRANCH + git_clone $OAC_REPO $OAC_DIR $OAC_BRANCH + git_clone $OCC_REPO $OCC_DIR $OCC_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 @@ -296,7 +301,7 @@ function create_heat_accounts { # build_heat_pip_mirror() - Build a pip mirror containing heat agent projects function build_heat_pip_mirror { - local project_dirs="$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR" + local project_dirs="$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR $DIB_UTILS_DIR" local projpath proj package rm -rf $HEAT_PIP_REPO diff --git a/stackrc b/stackrc index 02b12a36a0..f8d9c43c38 100644 --- a/stackrc +++ b/stackrc @@ -427,6 +427,10 @@ GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-master} # ################## +# run-parts script required by os-refresh-config +DIB_UTILS_REPO=${DIB_UTILS_REPO:-${GIT_BASE}/openstack/dib-utils.git} +DIB_UTILS_BRANCH=${DIB_UTILS_BRANCH:-master} + # os-apply-config configuration template tool OAC_REPO=${OAC_REPO:-${GIT_BASE}/openstack/os-apply-config.git} OAC_BRANCH=${OAC_BRANCH:-master}