This change adds the dib-utils repo, and adds git_clone calls for the
required os-*-config projects.
Change-Id: I2641feb0c462d2940f2698515ff62a2ff06c0e70
... | ... |
@@ -36,6 +36,7 @@ HEAT_DIR=$DEST/heat |
36 | 36 |
HEAT_CFNTOOLS_DIR=$DEST/heat-cfntools |
37 | 37 |
HEAT_TEMPLATES_REPO_DIR=$DEST/heat-templates |
38 | 38 |
OCC_DIR=$DEST/os-collect-config |
39 |
+DIB_UTILS_DIR=$DEST/dib-utils |
|
39 | 40 |
ORC_DIR=$DEST/os-refresh-config |
40 | 41 |
OAC_DIR=$DEST/os-apply-config |
41 | 42 |
|
... | ... |
@@ -224,6 +225,10 @@ function install_heat { |
224 | 224 |
function install_heat_other { |
225 | 225 |
git_clone $HEAT_CFNTOOLS_REPO $HEAT_CFNTOOLS_DIR $HEAT_CFNTOOLS_BRANCH |
226 | 226 |
git_clone $HEAT_TEMPLATES_REPO $HEAT_TEMPLATES_REPO_DIR $HEAT_TEMPLATES_BRANCH |
227 |
+ git_clone $OAC_REPO $OAC_DIR $OAC_BRANCH |
|
228 |
+ git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH |
|
229 |
+ git_clone $ORC_REPO $ORC_DIR $ORC_BRANCH |
|
230 |
+ git_clone $DIB_UTILS_REPO $DIB_UTILS_DIR $DIB_UTILS_BRANCH |
|
227 | 231 |
} |
228 | 232 |
|
229 | 233 |
# start_heat() - Start running processes, including screen |
... | ... |
@@ -304,7 +309,7 @@ function create_heat_accounts { |
304 | 304 |
|
305 | 305 |
# build_heat_pip_mirror() - Build a pip mirror containing heat agent projects |
306 | 306 |
function build_heat_pip_mirror { |
307 |
- local project_dirs="$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR" |
|
307 |
+ local project_dirs="$OCC_DIR $OAC_DIR $ORC_DIR $HEAT_CFNTOOLS_DIR $DIB_UTILS_DIR" |
|
308 | 308 |
local projpath proj package |
309 | 309 |
|
310 | 310 |
rm -rf $HEAT_PIP_REPO |
... | ... |
@@ -427,6 +427,10 @@ GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-master} |
427 | 427 |
# |
428 | 428 |
################## |
429 | 429 |
|
430 |
+# run-parts script required by os-refresh-config |
|
431 |
+DIB_UTILS_REPO=${DIB_UTILS_REPO:-${GIT_BASE}/openstack/dib-utils.git} |
|
432 |
+DIB_UTILS_BRANCH=${DIB_UTILS_BRANCH:-master} |
|
433 |
+ |
|
430 | 434 |
# os-apply-config configuration template tool |
431 | 435 |
OAC_REPO=${OAC_REPO:-${GIT_BASE}/openstack/os-apply-config.git} |
432 | 436 |
OAC_BRANCH=${OAC_BRANCH:-master} |