Revert "Move unique socket generation into quickstart.sh"

Moving socket creation to quickstart.sh results in unique
socket generation per call to quickstart.sh This breaks
jobs in CI requiring multiple calls to quickstart e.g.
periodic scale jobs

This reverts commit 542addffbd.

Change-Id: I0590f437a6a9ac7074c8de7bf3659d28dbe9c898
Closes-Bug: 1616479

ci-scripts/basic.sh

@@ -11,6 +11,12 @@ BUILD_SYS=$2
 CONFIG=$3
 JOB_TYPE=$4
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 bash $WORKSPACE/tripleo-quickstart/quickstart.sh \
     --working-dir $WORKSPACE/ \
     --no-clone \

ci-scripts/collect-logs.sh

@@ -8,6 +8,12 @@ export ANSIBLE_CONFIG=$WORKSPACE/tripleo-quickstart/ansible.cfg
 export SSH_CONFIG=$WORKSPACE/ssh.config.ansible
 export ANSIBLE_SSH_ARGS="-F ${SSH_CONFIG}"
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 bash $WORKSPACE/tripleo-quickstart/quickstart.sh \
     --working-dir $WORKSPACE/ \
     --no-clone \

ci-scripts/devmode_tempest.sh

@@ -8,6 +8,12 @@ BUILD_SYS=$2
 CONFIG=$3
 JOB_TYPE=$4
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 pushd $WORKSPACE/tripleo-quickstart
 
 bash $WORKSPACE/tripleo-quickstart/quickstart.sh \

ci-scripts/feature-scale-deploy.sh

@@ -18,6 +18,12 @@ else
     exit 1
 fi
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 pushd $WORKSPACE/tripleo-quickstart
 
 # run scale phase 1 against the gate job: Scale new compute node -> Delete original compute node

ci-scripts/full-deploy.sh

@@ -19,6 +19,12 @@ else
     exit 1
 fi
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 pushd $WORKSPACE/tripleo-quickstart
 bash quickstart.sh \
 --tags all \

ci-scripts/images.sh

@@ -25,6 +25,12 @@ else
     exit 1
 fi
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 bash $WORKSPACE/tripleo-quickstart/quickstart.sh \
   --tags all \
   --config $WORKSPACE/config/general_config/$CONFIG.yml \

ci-scripts/roles-deploy.sh

@@ -19,6 +19,12 @@ else
     exit 1
 fi
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 if [ "$JOB_TYPE" = "gate" ]; then
     # set up the gated repos and modify the requirements file to use them
     bash $WORKSPACE/tripleo-quickstart/quickstart.sh \

ci-scripts/upgrade.sh

@@ -24,6 +24,12 @@ else
     exit 1
 fi
 
+# (trown) This is so that we ensure separate ssh sockets for
+# concurrent jobs. Without this, two jobs running in parallel
+# would try to use the same undercloud-stack socket.
+socketdir=$(mktemp -d /tmp/sockXXXXXX)
+export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
+
 pushd $WORKSPACE/tripleo-quickstart
 bash quickstart.sh \
     -e undercloud_image_url="http://artifacts.ci.centos.org/artifacts/rdo/images/$RELEASE/$BUILD_SYS/$LOCATION/undercloud.qcow2" \

quickstart.sh

@@ -379,12 +379,6 @@ export ANSIBLE_INVENTORY=$OPT_WORKDIR/hosts
 #set the ansible ssh.config options if not already set.
 source $OOOQ_DIR/ansible_ssh_env.sh
 
-# (trown) This is so that we ensure separate ssh sockets for
-# concurrent jobs. Without this, two jobs running in parallel
-# would try to use the same undercloud-stack socket.
-socketdir=$(mktemp -d /tmp/sockXXXXXX)
-export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
-
 if [ "$OPT_RETAIN_INVENTORY_FILE" = 0 ]; then
     # Clear out inventory file to avoid tripping over data
     # from a previous invocation