From 540eae7b556fd438b03fec7f01f3193bbd3893a7 Mon Sep 17 00:00:00 2001
From: Wesley Hayutin <weshayutin@gmail.com>
Date: Mon, 13 Jun 2016 13:34:37 -0400
Subject: [PATCH] use environmental variables for ansible ssh configuration

quickstart does not set the ansible ssh configuration by default.
This change sets ANSIBLE_SSH_ARGS if it's not already set.

Change-Id: I61d8499fe16eb102a285972d347cef5acdbc71e8
---
 ansible_ssh_env.sh | 5 +++++
 quickstart.sh      | 3 +++
 2 files changed, 8 insertions(+)
 create mode 100644 ansible_ssh_env.sh

diff --git a/ansible_ssh_env.sh b/ansible_ssh_env.sh
new file mode 100644
index 000000000..dedadad13
--- /dev/null
+++ b/ansible_ssh_env.sh
@@ -0,0 +1,5 @@
+: ${OPT_WORKDIR:=$HOME/.quickstart}
+
+#ssh config
+: ${SSH_CONFIG=$OPT_WORKDIR/ssh.config.ansible}
+: ${ANSIBLE_SSH_ARGS="-F ${SSH_CONFIG}"}
diff --git a/quickstart.sh b/quickstart.sh
index 5d29c823d..c077e996f 100755
--- a/quickstart.sh
+++ b/quickstart.sh
@@ -304,6 +304,9 @@ set -ex
 export ANSIBLE_CONFIG=$OOOQ_DIR/ansible.cfg
 export ANSIBLE_INVENTORY=$OPT_WORKDIR/hosts
 
+#set the ansible ssh.config options if not already set.
+source $OOOQ_DIR/ansible_ssh_env.sh
+
 if [ "$OPT_RETAIN_INVENTORY_FILE" = 0 ]; then
     # Clear out inventory file to avoid tripping over data
     # from a previous invocation