From b1d5e9ff3c2e762ffc37759ca5e3886ac4d649c7 Mon Sep 17 00:00:00 2001
From: Chris Meyers <chris.meyers.fsu@gmail.com>
Date: Wed, 9 Dec 2015 07:52:43 -0500
Subject: [PATCH] removed ansible_python_interpreter

* added missed renames of ansible_deps to ansible_test_deps
* removed acidential inventory.dynamic file
* modified README for ansible_test_deps role
---
 .../ansible-playbook_integration_runner/inventory      |  2 +-
 .../inventory.dynamic                                  |  3 ---
 .../utils/ansible-playbook_integration_runner/main.yml |  2 +-
 .../roles/ansible_test_deps/README.md                  |  6 ++----
 .../roles/ansible_test_deps/test/main.yml              | 10 +++++-----
 5 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 test/utils/ansible-playbook_integration_runner/inventory.dynamic

diff --git a/test/utils/ansible-playbook_integration_runner/inventory b/test/utils/ansible-playbook_integration_runner/inventory
index 42de3a1b5d7..2302edae31b 100644
--- a/test/utils/ansible-playbook_integration_runner/inventory
+++ b/test/utils/ansible-playbook_integration_runner/inventory
@@ -1 +1 @@
-localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env python"
+localhost ansible_connection=local
diff --git a/test/utils/ansible-playbook_integration_runner/inventory.dynamic b/test/utils/ansible-playbook_integration_runner/inventory.dynamic
deleted file mode 100644
index 1aa03b4ed8d..00000000000
--- a/test/utils/ansible-playbook_integration_runner/inventory.dynamic
+++ /dev/null
@@ -1,3 +0,0 @@
-localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env python"
-[dynamic_hosts]
-54.157.26.110 ansible_ssh_user=root ansible_ssh_private_key_file=/Users/meyers/Dropbox/.ssh/Ansible_chris_meyers.pem
diff --git a/test/utils/ansible-playbook_integration_runner/main.yml b/test/utils/ansible-playbook_integration_runner/main.yml
index 8661a6dba9e..5d15541490f 100644
--- a/test/utils/ansible-playbook_integration_runner/main.yml
+++ b/test/utils/ansible-playbook_integration_runner/main.yml
@@ -36,7 +36,7 @@
     make_target: "non_destructive"
   #pre_tasks:
   roles:
-    - { role: ansible_deps, tags: ansible_deps }
+    - { role: ansible_test_deps, tags: ansible_test_deps }
     - { role: run_integration,
         tags: run_integration,
         run_integration_test_flags: "{{ test_flags }}",
diff --git a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/README.md b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/README.md
index f0fc755863c..09ffacacaf5 100644
--- a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/README.md
+++ b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/README.md
@@ -1,8 +1,6 @@
-[![Build Status](https://travis-ci.org/chrismeyersfsu/role-ansible_deps.svg)](https://travis-ci.org/chrismeyersfsu/role-ansible_deps)
+[![Build Status](https://travis-ci.org/chrismeyersfsu/ansible_test_deps.svg)](https://travis-ci.org/chrismeyersfsu/ansible_test_deps)
 
-ansible_deps
+ansible_test_deps
 =========
 
 Install needed packages to run ansible integration tests.
-
-This role is periodically synced from ansible core repo to chrismeyersfsu/role-ansible_deps so that automated tests may run and so this role is accessible from galaxy.
diff --git a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml
index 95617dbfac3..b66d699d5d6 100644
--- a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml
+++ b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml
@@ -4,21 +4,21 @@
   gather_facts: false
   vars:
     inventory:
-      - name: ansible_deps_host_1
+      - name: ansible_test_deps_host_1
         image: "chrismeyers/centos6"
-      - name: ansible_deps_host_2
+      - name: ansible_test_deps_host_2
         image: "chrismeyers/ubuntu12.04"
-      - name: ansible_deps_host_3
+      - name: ansible_test_deps_host_3
         image: "ubuntu-upstart:14.04"
   roles:
     - { role: provision_docker, provision_docker_company: 'ansible', provision_docker_inventory: "{{ inventory }}" }
 
-- name: Run ansible_deps Tests
+- name: Run ansible_test_deps Tests
   hosts: docker_containers
   vars:
     git_dir: "/tmp/ansible"
   roles:
-    - { role: ansible_deps }
+    - { role: ansible_test_deps }
   tasks:
     - name: Clone ansible
       git: