Move Multinode environments to THT

Scenarios already live in THT because they contain some data (like
TripleO services or data binding) that are specific to TripleO releases.
Example: NovaPlacement has been introduced in TriplO Ocata but not
support in Newton. That's the reason we moved scenarios templates and
pingtests in THT, so they can be branched.
This patch does the same for multinode and multinode-3nodes. It moves
the roles-data and pingtest to THT.

Change-Id: I689d85918d78f51951e0c142f5cfb51b5c1f78f5

scripts/common_functions.sh

@@ -314,7 +314,7 @@ function layer_ci_repo {
 function echo_vars_to_deploy_env {
     CALLER=$(caller)
     echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
-    for VAR in CENTOS_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL UNDERCLOUD_HEAT_CONVERGENCE RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK PINGTEST_TEMPLATE OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS; do
+    for VAR in CENTOS_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL UNDERCLOUD_HEAT_CONVERGENCE RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS; do
         echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
     done
     for role in $OVERCLOUD_ROLES; do

scripts/quickstart/multinode-settings.yml

@@ -1,6 +1,6 @@
 extra_args: >
     -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml
-    -e ${TRIPLEO_ROOT}/tripleo-ci/test-environments/multinode.yaml
+    -e /usr/share/openstack-tripleo-heat-templates/ci/environments/multinode.yaml
     -e ${TRIPLEO_ROOT}/tripleo-ci/test-environments/worker-config.yaml
     --compute-scale 0
 ssl_overcloud: false

scripts/tripleo.sh

@@ -153,7 +153,6 @@ OVERCLOUD_SANITYTEST=${OVERCLOUD_SANITYTEST:-""}
 SANITYTEST_CONTENT_NAME=${SANITYTEST_CONTENT_NAME:-"sanity_test"}
 SKIP_PINGTEST_CLEANUP=${SKIP_PINGTEST_CLEANUP:-""}
 OVERCLOUD_PINGTEST=${OVERCLOUD_PINGTEST:-""}
-PINGTEST_TEMPLATE=${PINGTEST_TEMPLATE:-"tenantvm_floatingip"}
 UNDERCLOUD_SANITY_CHECK=${UNDERCLOUD_SANITY_CHECK:-""}
 REPO_SETUP=${REPO_SETUP:-""}
 REPO_PREFIX=${REPO_PREFIX:-"/etc/yum.repos.d/"}
@@ -1007,10 +1006,12 @@ function overcloud_pingtest {
     if [ -e /usr/share/openstack-tripleo-heat-templates/ci/pingtests/$MULTINODE_ENV_NAME.yaml ]; then
         TENANT_PINGTEST_TEMPLATE=/usr/share/openstack-tripleo-heat-templates/ci/pingtests/$MULTINODE_ENV_NAME.yaml
     else
-      TENANT_PINGTEST_TEMPLATE=/usr/share/tripleo-ci/$PINGTEST_TEMPLATE.yaml
-      if [ ! -e $TENANT_PINGTEST_TEMPLATE ]; then
-          TENANT_PINGTEST_TEMPLATE=$(dirname `readlink -f -- $0`)/../templates/$PINGTEST_TEMPLATE.yaml
-      fi
+        if [ -e /usr/share/openstack-tripleo-heat-templates/ci/pingtests/$MULTINODE_ENV_NAME.yaml ]; then
+            TENANT_PINGTEST_TEMPLATE=/usr/share/openstack-tripleo-heat-templates/ci/pingtests/tenantvm_floatingip.yaml
+        else
+            # For Mitaka, we don't have tripleo-heat-templates/ci directory, so we still manage the pingtest here.
+            TENANT_PINGTEST_TEMPLATE=$TRIPLEO_ROOT/tripleo-ci/templates/tenantvm_floatingip.yaml
+        fi
     fi
     log "Overcloud pingtest, creating tenant-stack heat stack:"
     openstack stack create -f yaml -t $TENANT_PINGTEST_TEMPLATE $TENANT_STACK_DEPLOY_ARGS tenant-stack || exitval=1

templates/tenantvm_floatingip.yaml

@@ -1,6 +1,8 @@
 heat_template_version: 2013-05-23
 
 description: >
+  This template resides in tripleo-ci for Mitaka CI jobs only.
+  For Newton and beyond, please look in THT.
   HOT template to create a new neutron network plus a router to the public
   network, and for deploying a server into the new network. The template also
   assigns a floating IP address and sets security group rules. ADAPTED FROM

toci_gate_test.sh

@@ -98,15 +98,11 @@ export UNDERCLOUD_UI=0
 export UNDERCLOUD_VALIDATIONS=0
 
 if [[ $TOCI_JOBTYPE =~ scenario ]]; then
-    # note: we don't need PINGTEST_TEMPLATE here. See tripleo.sh. Though
-    # we need to export it for logs purpose.
-    export PINGTEST_TEMPLATE=
     export MULTINODE_ENV_NAME=$TOCI_JOBTYPE
     MULTINODE_ENV_PATH=/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml
 else
-    export PINGTEST_TEMPLATE=${PINGTEST_TEMPLATE:-"tenantvm_floatingip"}
     export MULTINODE_ENV_NAME='multinode'
-    MULTINODE_ENV_PATH=$TRIPLEO_ROOT/tripleo-ci/test-environments/$MULTINODE_ENV_NAME.yaml
+    MULTINODE_ENV_PATH=/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml
 fi
 if [[ "$TOCI_JOBTYPE" =~ "periodic" && "$TOCI_JOBTYPE" =~ "-ha" ]]; then
     TEST_OVERCLOUD_DELETE=1
@@ -246,7 +242,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
                 OVERCLOUD_ROLES="ControllerApi Controller"
                 export ControllerApi_hosts=$(sed -n 1,1p /etc/nodepool/sub_nodes)
                 export Controller_hosts=$(sed -n 2,2p /etc/nodepool/sub_nodes)
-                OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/multinode-3nodes.yaml --compute-scale 0 --overcloud-ssh-user $OVERCLOUD_SSH_USER --validation-errors-nonfatal -r $TRIPLEO_ROOT/tripleo-ci/test-environments/multinode-3nodes-roles-data.yaml"
+                OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/multinode-3nodes.yaml --compute-scale 0 --overcloud-ssh-user $OVERCLOUD_SSH_USER --validation-errors-nonfatal -r /usr/share/openstack-tripleo-heat-templates/ci/environments/multinode-3nodes.yaml"
             else
                 NODECOUNT=1
                 CONTROLLER_HOSTS=$(sed -n 1,1p /etc/nodepool/sub_nodes)