openstack
/
tripleo-ci
Code Issues Proposed changes

Use playbook from tripleo-quickstart-extras for OVB 

This is the final step to cut over to the combined
playbook in tripleo-quickstart-extras, so that we can
use a common playbook whether there is a testenv broker
involved or not.

Change-Id: I3ed261e3660426e62ed608bc1bc7923f3912a508
This commit is contained in:
John Trowbridge 2017-10-19 16:52:59 -04:00 committed by Gabriele Cerami
parent 9d7f3fe78e
commit 473afcc755
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toci-quickstart/config/testenv/ovb.yml
View File

@ -1,6 +1,10 @@
undercloud_type: ovb
use_testenv_broker: true
build_test_packages: true
undercloud_user: "{{ lookup('env','USER') }}"
non_root_user: "{{ undercloud_user }}"
ssh_user: "{{ undercloud_user }}"
existing_key_location: "/etc/nodepool/id_rsa"
enable_vbmc: false
gating_repo_enabled: true
@ -14,6 +18,8 @@ non_root_user_setup: false
step_set_undercloud_hostname: true
undercloud_hostname: undercloud
undercloud_docker_registry_mirror: "{{ lookup('env','NODEPOOL_DOCKER_REGISTRY_PROXY') }}"
run_validate_undercloud: true
step_overcloud_prep_flavors: false
skip_pingtest_cleanup: true
# Overcloud deploy

2
toci_gate_test-oooq.sh
View File

@ -138,7 +138,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
OVB=1
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"]')
PLAYBOOK="ovb.yml"
PLAYBOOK="baremetal-full-deploy.yml"
ENV_VARS="$ENV_VARS --environment $TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb.yml"
if [[ -f "$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml" ]]; then
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/ovb-$RHCLOUD.yml"