Remove epel-release / python-pip from role
These are dependencies our role requires. As such, they should be installed by the user. Change-Id: I736463187b3210ccada6b7c5f9202047ce6b0e86 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
0be7476761
commit
bc0cb78b77
@ -18,6 +18,8 @@ so that changes are only merged if they pass tests.
|
|||||||
Requirements
|
Requirements
|
||||||
------------
|
------------
|
||||||
|
|
||||||
|
See `bindep.txt` for role dependencies.
|
||||||
|
|
||||||
Packages
|
Packages
|
||||||
~~~~~~~~
|
~~~~~~~~
|
||||||
|
|
||||||
|
@ -2,3 +2,4 @@
|
|||||||
# see http://docs.openstack.org/infra/bindep/ for additional information.
|
# see http://docs.openstack.org/infra/bindep/ for additional information.
|
||||||
|
|
||||||
libselinux-python [platform:rpm]
|
libselinux-python [platform:rpm]
|
||||||
|
python-pip
|
||||||
|
@ -17,15 +17,6 @@
|
|||||||
zuul_build_depends: "{{ __zuul_build_depends | list }}"
|
zuul_build_depends: "{{ __zuul_build_depends | list }}"
|
||||||
when: zuul_build_depends is not defined
|
when: zuul_build_depends is not defined
|
||||||
|
|
||||||
# NOTE(pabelanger): This needs to be here for now, since we need python-pip.
|
|
||||||
- name: Ensure EPEL is enabled.
|
|
||||||
become: yes
|
|
||||||
package:
|
|
||||||
name: epel-release
|
|
||||||
state: installed
|
|
||||||
when: (zuul_install_method == 'git' or zuul_install_method == 'pip') and
|
|
||||||
ansible_os_family == 'RedHat'
|
|
||||||
|
|
||||||
- name: Ensure build dependencies are installed.
|
- name: Ensure build dependencies are installed.
|
||||||
become: yes
|
become: yes
|
||||||
package:
|
package:
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
__zuul_build_depends:
|
__zuul_build_depends:
|
||||||
- git
|
- git
|
||||||
- python-dev
|
- python-dev
|
||||||
- python-pip
|
|
||||||
|
|
||||||
__zuul_file_zuul_service_config_dest: /etc/default/zuul
|
__zuul_file_zuul_service_config_dest: /etc/default/zuul
|
||||||
__zuul_file_zuul_service_config_mode: "0644"
|
__zuul_file_zuul_service_config_mode: "0644"
|
||||||
|
@ -17,7 +17,6 @@ __zuul_build_depends:
|
|||||||
- gcc-c++
|
- gcc-c++
|
||||||
- git
|
- git
|
||||||
- python-devel
|
- python-devel
|
||||||
- python-pip
|
|
||||||
|
|
||||||
__zuul_file_zuul_service_config_dest: /etc/sysconfig/zuul
|
__zuul_file_zuul_service_config_dest: /etc/sysconfig/zuul
|
||||||
__zuul_file_zuul_service_config_mode: "0644"
|
__zuul_file_zuul_service_config_mode: "0644"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user