From 9e7307bc66482ff5efeb336c28679c59c6102d01 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Tue, 8 Sep 2015 09:45:58 +0100 Subject: [PATCH] Add support for the puppet ha job Change-Id: Ib96071955072d039d658ebfe4514bf6b113fd1b7 --- toci_gate_test.sh | 2 +- toci_gate_test_instack.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/toci_gate_test.sh b/toci_gate_test.sh index 675d5aeb0..87016647a 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -11,7 +11,7 @@ cd $(dirname $0) # Switch to instack ci once we drop support for tripleo-incubator # we can drop the dual code path case $TOCI_JOBTYPE in - overcloud-f21-nonha|overcloud-f21puppet-ceph) + overcloud-f21-nonha|overcloud-f21puppet-ha|overcloud-f21puppet-ceph) ./toci_gate_test_instack.sh $@ exit 0 ;; diff --git a/toci_gate_test_instack.sh b/toci_gate_test_instack.sh index cb8c0f40c..5d072c12e 100755 --- a/toci_gate_test_instack.sh +++ b/toci_gate_test_instack.sh @@ -19,6 +19,13 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do NODECOUNT=4 DEPLOYFLAGS="--ceph-storage-scale 2 -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-ceph-devel.yaml" ;; + ha) + NODECOUNT=4 + # In ci our overcloud nodes don't have access to an external netwrok + # --ntp-server is here to make the deploy command happy, the ci env + # is on virt so the clocks should be in sync without it. + DEPLOYFLAGS="--control-scale 3 --ntp-server 0.centos.pool.ntp.org" + ;; esac done