From 6169255f94acf6ce38d020b05b2e9982746f41b9 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: Id185ce42a77ecf87874655ddf178a3d0fa0ff36a
---
 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 62083976..63df61fb 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation and setup of swift
   company: Rackspace
   license: Apache2
-  min_ansible_version: 1.6.6
+  min_ansible_version: 1.9
   platforms:
     - name: Ubuntu
       versions:
@@ -30,12 +30,7 @@ galaxy_info:
     - development
     - openstack
 dependencies:
-  - role: pip_lock_down
-    when:
-      - not swift_developer_mode | bool
-  - role: pip_install
-    when:
-      - swift_developer_mode | bool
+  - pip_install
   - role: apt_package_pinning
     when:
       - ansible_pkg_mgr == 'apt'
diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml
index db1b9776..60f2be0d 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: openstack_openrc
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
   scm: git