From 0e23c45f9f4fece16fa22e0cc5c4f38c3ea5239c Mon Sep 17 00:00:00 2001
From: Ben Nemec <openstack@nemebean.com>
Date: Fri, 2 Dec 2016 16:25:25 +0000
Subject: [PATCH] Revert "Temporarily disable ceph in the updates job"

This reverts commit 9cd186d0653af2c586a8d2d36237cfab2c3e1244.

Change-Id: Ib9648d8a0caf6935b094b2704f9838e55efaf161
Closes-Bug: 1641653
---
 toci_gate_test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/toci_gate_test.sh b/toci_gate_test.sh
index 49f0994ff..2f637a4ce 100755
--- a/toci_gate_test.sh
+++ b/toci_gate_test.sh
@@ -115,8 +115,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
     case $JOB_TYPE_PART in
         updates)
             if [[ "$TOCI_JOBTYPE" =~ 'ovb-updates' ]] ; then
-                NODECOUNT=2
-                # TODO(bnemec): Re-enable Ceph in the updates job
+                NODECOUNT=3
                 if [[ "${STABLE_RELEASE}" =~ ^mitaka$ ]] ; then
                     ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
                     CA_ENVIRONMENT_FILE=inject-trust-anchor-ipv6.yaml
@@ -133,6 +132,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
                     -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable-tls-ipv6.yaml
                     -e $ENDPOINT_LIST_LOCATION/tls-endpoints-public-ip.yaml
                     -e $TRIPLEO_ROOT/tripleo-ci/test-environments/$CA_ENVIRONMENT_FILE
+                    --ceph-storage-scale 1
+                    -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml
                 "
                 OVERCLOUD_UPDATE_ARGS="-e /usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml $OVERCLOUD_DEPLOY_ARGS"
                 NETISO_V6=1