Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update beaker setup dependencies with linchpin #1346

Merged
merged 2 commits into from
Dec 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions linchpin/provision/roles/dependencies/tasks/beaker_deps.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
- name: Install pypi dependencies of beaker
pip:
name: "{{ bkr_pkg }}"
with_items:
- 'beaker-client>=23.3'
- 'python-krbV'
- 'bottle'
loop_control:
loop_var: bkr_pkg
name: ['beaker==27.0', 'python-gssapi', 'bottle']
6 changes: 3 additions & 3 deletions linchpin/provision/roles/dependencies/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
debug:
msg: "{{ setup_providers }}"


- name: Install dependencies per provider
include_tasks: "{{ indv_prov }}_deps.yml"
with_items: "{{ setup_providers }}"
loop_control:
loop_var: indv_prov

- name: Install os-specific dependencies Fedora
- name: Install os-specific dependencies CentOS/RHEL
- name: "Install os-specific dependencies Fedora"
include_tasks: "setup_dnf_deps.yml"
when: setup_providers | length == 0 and ansible_distribution == 'Fedora'

- name: Install os-specific dependencies CentOS/RHEL
- name: "Install os-specific dependencies CentOS/RHEL"
include_tasks: "setup_yum_deps.yml"
when: setup_providers | length == 0 and (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
tests_require=["pytest<=4.4.0", "nose", "mock", "coverage", "flake8"],
extras_require={
'krbV': ["python-krbV"],
'beaker': ['beaker-client>=23.3', 'python-krbV'],
'beaker': ['beaker-client>=27.0', 'python-gssapi', 'bottle'],

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need bottle?
It is definitely not part of Beaker requirements.

'docs': ["docutils", "sphinx", "sphinx_rtd_theme", "sphinx-automodapi"],
'tests': ["nose", "mock", "coverage", "flake8",
"pytest<=4.4.0", "pytest-runner"],
Expand Down