From 332ffaa1292e1ada30633f9f1dbd1a641875d46f Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Wed, 13 Jan 2016 09:32:05 -0500
Subject: [PATCH] Pin Ansible version prior to the 2.0.0.1-1 release

It seems that the submodule refs for the core modules was updated
to a version that is presently not working.  Temporarilly pinning
version prior to the release.

Partial-Bug: #1534155
Change-Id: I9aeebb361442d11e32a981dcb5cb815b9f82aa8d
---
 scripts/env-setup.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh
index b0501defa..3f4a63aeb 100755
--- a/scripts/env-setup.sh
+++ b/scripts/env-setup.sh
@@ -2,7 +2,10 @@
 set -e
 
 ANSIBLE_GIT_URL=${ANSIBLE_GIT_URL:-https://github.com/ansible/ansible.git}
-ANSIBLE_GIT_BRANCH=${ANSIBLE_GIT_BRANCH:-stable-2.0}
+# Note(TheJulia): Normally this should be stable-2.0, pinning due to
+# issues with the stable branch.
+# https://github.com/ansible/ansible-modules-core/issues/2804
+ANSIBLE_GIT_BRANCH=${ANSIBLE_GIT_BRANCH:-v2.0.0.0-1}
 
 if [ -x '/usr/bin/apt-get' ]; then
     if ! $(gcc -v &>/dev/null); then
@@ -58,7 +61,7 @@ if [ ! -d ansible ]; then
 else
     cd ansible
     git checkout $ANSIBLE_GIT_BRANCH
-    git pull --rebase
+    git pull --rebase origin $ANSIBLE_GIT_BRANCH
     git submodule update --init --recursive
     git fetch
 fi