From d5db6392b4951871bdca3f1535e7a81bb77b0d9d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 8 Feb 2018 12:25:32 +0100 Subject: [PATCH] Reinstall Koschei on Fedora 27 --- .../host_vars/koschei-web01.phx2.fedoraproject.org | 4 ++-- roles/koschei/common/tasks/main.yml | 12 +----------- roles/koschei/common/templates/copr.repo.j2 | 4 ---- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/inventory/host_vars/koschei-web01.phx2.fedoraproject.org b/inventory/host_vars/koschei-web01.phx2.fedoraproject.org index 59f61fbf25..01b93972ef 100644 --- a/inventory/host_vars/koschei-web01.phx2.fedoraproject.org +++ b/inventory/host_vars/koschei-web01.phx2.fedoraproject.org @@ -3,8 +3,8 @@ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 -ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-27 +ks_repo: http://10.5.126.23/pub/fedora/linux/releases/27/Server/x86_64/os/ volgroup: /dev/vg_guests eth0_ip: 10.5.126.140 diff --git a/roles/koschei/common/tasks/main.yml b/roles/koschei/common/tasks/main.yml index af8988e54d..94cfb6d267 100644 --- a/roles/koschei/common/tasks/main.yml +++ b/roles/koschei/common/tasks/main.yml @@ -8,20 +8,10 @@ - packages - yumrepos -- name: Install common packages (Fedora >= 27) +- name: Install common packages package: name={{ item }} state=present with_items: - python3-memcached - when: ansible_distribution_major_version|int > 26 - tags: - - koschei - - packages - -- name: Install common packages (not Fedora or Fedora <= 26) - package: name={{ item }} state=present - with_items: - - python-memcached - when: ansible_distribution_major_version|int < 27 tags: - koschei - packages diff --git a/roles/koschei/common/templates/copr.repo.j2 b/roles/koschei/common/templates/copr.repo.j2 index a614a7ddb2..fccacb922f 100644 --- a/roles/koschei/common/templates/copr.repo.j2 +++ b/roles/koschei/common/templates/copr.repo.j2 @@ -1,10 +1,6 @@ [msimacek-koschei] name=Copr repo for koschei owned by msimacek -{% if is_fedora is defined %} baseurl=https://copr-be.cloud.fedoraproject.org/results/msimacek/koschei/fedora-$releasever-$basearch/ -{% else %} -baseurl=https://copr-be.cloud.fedoraproject.org/results/msimacek/koschei/epel-7-$basearch/ -{% endif %} skip_if_unavailable=True gpgcheck=1 gpgkey=https://copr-be.cloud.fedoraproject.org/results/msimacek/koschei/pubkey.gpg