From 335f22c6aca3e0f4d93f0a704a254c3f00bdbc15 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sat, 3 Sep 2016 22:28:22 -0400 Subject: [PATCH] Remove epel-release / python-pip from role These are dependencies our role requires. As such, they should be installed by the user. Change-Id: I6039ac5e8483084c08fb98adc0ae855af35da0e4 Signed-off-by: Paul Belanger --- README.rst | 2 ++ bindep.txt | 4 ++++ tasks/install.yaml | 8 -------- vars/Debian.yaml | 1 - vars/RedHat.yaml | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index d88b191..c70bab9 100644 --- a/README.rst +++ b/README.rst @@ -18,6 +18,8 @@ ramdisk images. Requirements ------------ +See `bindep.txt` for role dependencies. + Packages ~~~~~~~~ diff --git a/bindep.txt b/bindep.txt index e69de29..cac9e3d 100644 --- a/bindep.txt +++ b/bindep.txt @@ -0,0 +1,4 @@ +# This is a cross-platform list tracking distribution packages needed by tests; +# see http://docs.openstack.org/infra/bindep/ for additional information. + +python-pip diff --git a/tasks/install.yaml b/tasks/install.yaml index dcc8e3e..24e812c 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -27,14 +27,6 @@ diskimage_builder_package_name: "{{ __diskimage_builder_package_name }}" when: diskimage_builder_package_name is not defined -# NOTE(pabelanger): This needs to be here for now, since we need python-pip. -- name: Ensure EPEL is enabled. - package: - name: epel-release - state: installed - when: (diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip') and - ansible_os_family == 'RedHat' - - name: Ensure build dependencies are installed. package: name: "{{ item }}" diff --git a/vars/Debian.yaml b/vars/Debian.yaml index cd8b3e0..06437c4 100644 --- a/vars/Debian.yaml +++ b/vars/Debian.yaml @@ -14,7 +14,6 @@ --- __diskimage_builder_build_depends: - git - - python-pip __diskimage_builder_depends: - debootstrap diff --git a/vars/RedHat.yaml b/vars/RedHat.yaml index 785bc83..539a431 100644 --- a/vars/RedHat.yaml +++ b/vars/RedHat.yaml @@ -14,7 +14,6 @@ --- __diskimage_builder_build_depends: - git - - python-pip __diskimage_builder_depends: - debootstrap