From e64d4dc1d84ee2078e317c2b11523c33f0946579 Mon Sep 17 00:00:00 2001 From: samvaran kashyap Date: Wed, 25 Sep 2019 13:41:21 -0400 Subject: [PATCH] Update beaker setup dependencies with linchpin --- .../provision/roles/dependencies/tasks/beaker_deps.yml | 8 +------- linchpin/provision/roles/dependencies/tasks/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/linchpin/provision/roles/dependencies/tasks/beaker_deps.yml b/linchpin/provision/roles/dependencies/tasks/beaker_deps.yml index 02fa6fe1f..9a57ce53a 100644 --- a/linchpin/provision/roles/dependencies/tasks/beaker_deps.yml +++ b/linchpin/provision/roles/dependencies/tasks/beaker_deps.yml @@ -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: ['git+https://github.com/beaker-project/beaker.git@develop#subdirectory=Client/', 'python-gssapi', 'bottle'] diff --git a/linchpin/provision/roles/dependencies/tasks/main.yml b/linchpin/provision/roles/dependencies/tasks/main.yml index 1c1c29e41..433269d5b 100644 --- a/linchpin/provision/roles/dependencies/tasks/main.yml +++ b/linchpin/provision/roles/dependencies/tasks/main.yml @@ -10,11 +10,11 @@ loop_control: loop_var: indv_prov -- name: Install os-specific depdendencies:: Fedora +- name: "Install os-specific depdendencies Fedora" include_tasks: "setup_dnf_deps.yml" when: setup_providers | length == 0 and ansible_distribution == 'Fedora' -- name: Install os-specific depdendencies:: CentOS/RHEL +- name: "Install os-specific depdendencies CentOS/RHEL" include_tasks: "setup_yum_deps.yml" when: setup_providers | length == 0 and (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS')