From a36051f03aacb0f586922945929cf78285525734 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Sat, 7 May 2016 13:39:10 -0700
Subject: [PATCH] Remove pip_lock_down dependency

The pip_install and pip_lock_down roles have been merged.

Remove pip_lock_down from the role's meta dependencies and test
requirements.

Change-Id: I1f928025b654734ab05a9cd448a2eaf03c509486
---
 meta/main.yml                       | 9 ++-------
 tests/ansible-role-requirements.yml | 4 ----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index 362eede3..9dcf0bee 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation and setup of tempest
   company: Rackspace
   license: Apache2
-  min_ansible_version: 1.6.6
+  min_ansible_version: 1.9
   platforms:
     - name: Ubuntu
       versions:
@@ -30,11 +30,6 @@ galaxy_info:
     - development
     - openstack
 dependencies:
+  - pip_install
   - apt_package_pinning
-  - role: pip_lock_down
-    when:
-      - not tempest_developer_mode | bool
-  - role: pip_install
-    when:
-      - tempest_developer_mode | bool
   - openstack_openrc
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index dac66bd4..d01ecd38 100644
--- a/tests/ansible-role-requirements.yml
+++ b/tests/ansible-role-requirements.yml
@@ -6,10 +6,6 @@
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   scm: git
   version: master
-- name: pip_lock_down
-  src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down
-  scm: git
-  version: master
 - name: memcached_server
   src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
   scm: git