From 48b4d6abfe14eba3c452c5c4087022ac4126fcde Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Tue, 2 Jun 2015 07:29:09 -0400
Subject: [PATCH] Lock Bifrost to Ansible stable-1.9

Due to a change landing in Ansible devel branch, we need to lock
the version to stable-1.9.

Update modules to explicitly define auth_type for compatability with
Ansible 1.9.

This change superceeds: I6dc3842bda19234921cd10fc5836ef8cfdcabb82

Ansible bug: https://github.com/ansible/ansible/issues/11119

Change-Id: Id4002fd95c09cb765ef9268c8ee35f1d9ce90107
Partial-Bug: #1461025
---
 playbooks/library/os_ironic.py      |  1 +
 playbooks/library/os_ironic_node.py |  1 +
 scripts/env-setup.sh                | 12 ++++++------
 scripts/test-bifrost.sh             |  5 +++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/playbooks/library/os_ironic.py b/playbooks/library/os_ironic.py
index e74376a39..7b2137163 100644
--- a/playbooks/library/os_ironic.py
+++ b/playbooks/library/os_ironic.py
@@ -208,6 +208,7 @@ def _exit_node_not_updated(module, server):
 
 def main():
     argument_spec = openstack_full_argument_spec(
+        auth_type=dict(required=False),
         uuid=dict(required=False),
         name=dict(required=False),
         driver=dict(required=False),
diff --git a/playbooks/library/os_ironic_node.py b/playbooks/library/os_ironic_node.py
index a50d6897e..3d83e69c4 100644
--- a/playbooks/library/os_ironic_node.py
+++ b/playbooks/library/os_ironic_node.py
@@ -211,6 +211,7 @@ def _check_set_power_state(module, cloud, node):
 
 def main():
     argument_spec = openstack_full_argument_spec(
+        auth_type=dict(required=False),
         uuid=dict(required=False),
         name=dict(required=False),
         instance_info=dict(type='dict', required=False),
diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh
index ae187e3ee..83116c155 100755
--- a/scripts/env-setup.sh
+++ b/scripts/env-setup.sh
@@ -30,18 +30,18 @@ fi
 sudo -H chown -R $u:$g /opt/stack
 cd /opt/stack
 
+# NOTE(TheJulia): Switching to Ansible stable-1.9 branch as the development
+# branch is undergoing some massive changes and we are seeing odd failures
+# that we should not be seeing.  Until devel has stabilized, we should stay
+# on the stable branch.
 if [ ! -d ansible ]; then
-    git clone https://github.com/ansible/ansible.git --recursive
+    git clone https://github.com/ansible/ansible.git --recursive -b stable-1.9
 else
     cd ansible
-    git checkout devel
+    git checkout stable-1.9
     git pull --rebase
     git submodule update --init --recursive
     git fetch
-    # Temporary direct checkout of devel due to broken modules until
-    # the submodules pointers get updated in the core ansible repo.
-    cd lib/ansible/modules/core
-    git checkout devel
 fi
 
 echo
diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh
index b2ca558a2..f3e718336 100755
--- a/scripts/test-bifrost.sh
+++ b/scripts/test-bifrost.sh
@@ -9,7 +9,12 @@ BIFROST_HOME=$SCRIPT_HOME/..
 $SCRIPT_HOME/env-setup.sh
 
 # Source Ansible
+# NOTE(TheJulia): Ansible stable-1.9 source method tosses an error deep
+# under the hood which -x will detect, so for this step, we need to suspend
+# and then re-enable the feature.
+set +x
 source /opt/stack/ansible/hacking/env-setup
+set -x
 
 # Change working directory
 cd $BIFROST_HOME/playbooks