Merge "Allow custom sequence of playbooks"
This commit is contained in:
commit
3ade40abf2
|
@ -99,8 +99,6 @@ export FEATURESET_FILE=""
|
||||||
export FEATURESET_CONF=""
|
export FEATURESET_CONF=""
|
||||||
# Define file with nodes topology
|
# Define file with nodes topology
|
||||||
export NODES_FILE=""
|
export NODES_FILE=""
|
||||||
# Indentifies which playbooks to run
|
|
||||||
export PLAYBOOKS=""
|
|
||||||
# Set the number of overcloud nodes
|
# Set the number of overcloud nodes
|
||||||
export NODECOUNT=0
|
export NODECOUNT=0
|
||||||
# Sets the undercloud hostname
|
# Sets the undercloud hostname
|
||||||
|
@ -150,9 +148,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
ENVIRONMENT="ovb"
|
ENVIRONMENT="ovb"
|
||||||
UCINSTANCEID=$(http_proxy= curl http://169.254.169.254/openstack/2015-10-15/meta_data.json | python -c 'import json, sys; print json.load(sys.stdin)["uuid"]')
|
UCINSTANCEID=$(http_proxy= curl http://169.254.169.254/openstack/2015-10-15/meta_data.json | python -c 'import json, sys; print json.load(sys.stdin)["uuid"]')
|
||||||
if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
|
if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
|
||||||
PLAYBOOKS="baremetal-full-deploy.yml"
|
export PLAYBOOKS=${PLAYBOOKS:-"baremetal-full-deploy.yml"}
|
||||||
else
|
else
|
||||||
PLAYBOOKS="ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml"
|
export PLAYBOOKS=${PLAYBOOKS:-"ovb-setup.yml baremetal-full-undercloud.yml baremetal-full-overcloud-prep.yml baremetal-full-overcloud.yml baremetal-full-overcloud-validate.yml"}
|
||||||
fi
|
fi
|
||||||
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb.yml"
|
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb.yml"
|
||||||
if [[ -f "$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml" ]]; then
|
if [[ -f "$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml" ]]; then
|
||||||
|
@ -164,9 +162,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
SUBNODES_SSH_KEY=/etc/nodepool/id_rsa
|
SUBNODES_SSH_KEY=/etc/nodepool/id_rsa
|
||||||
ENVIRONMENT="osinfra"
|
ENVIRONMENT="osinfra"
|
||||||
if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
|
if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
|
||||||
PLAYBOOKS="multinode.yml"
|
export PLAYBOOKS=${PLAYBOOKS:-"multinode.yml"}
|
||||||
else
|
else
|
||||||
PLAYBOOKS="quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml"
|
export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml"}
|
||||||
fi
|
fi
|
||||||
FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
|
FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
|
||||||
if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
|
if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
|
||||||
|
@ -183,9 +181,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
ENVIRONMENT="osinfra"
|
ENVIRONMENT="osinfra"
|
||||||
UNDERCLOUD="127.0.0.2"
|
UNDERCLOUD="127.0.0.2"
|
||||||
if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
|
if [[ " $QUICKSTART_SH_JOBS " =~ " $TOCI_JOBTYPE " ]]; then
|
||||||
PLAYBOOKS="multinode.yml"
|
export PLAYBOOKS=${PLAYBOOKS:-"multinode.yml"}
|
||||||
else
|
else
|
||||||
PLAYBOOKS="quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml"
|
export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml"}
|
||||||
fi
|
fi
|
||||||
FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
|
FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
|
||||||
if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
|
if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
|
||||||
|
|
Loading…
Reference in New Issue