From 25db7ac26b7b4a4b3c0b0e818f62cef640400378 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory 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: Ide428f507dcf3537b94ac05a15b52981c3a51ba2 --- meta/main.yml | 7 +------ tests/ansible-role-requirements.yml | 4 ---- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index b048f6a..ac294e6 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -31,13 +31,8 @@ galaxy_info: - development - openstack dependencies: + - pip_install - role: apt_package_pinning when: - ansible_pkg_mgr == 'apt' - - role: pip_lock_down - when: - - not aodh_developer_mode | bool - - role: pip_install - when: - - aodh_developer_mode | bool - openstack_openrc diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 8b2f0be..b11e2c9 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