From eb61b06a568c0554eeedb4b49afa467ba6ccd602 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 23 Aug 2015 19:33:49 +0000 Subject: [PATCH] Fix resolv.conf on s390 koji for good hopefully. --- inventory/host_vars/s390-koji01.qa.fedoraproject.org | 3 +++ roles/base/files/resolv.conf/qa | 6 ++++++ roles/bodhi/backend/tasks/main.yml | 5 +++++ 3 files changed, 14 insertions(+) create mode 100644 roles/base/files/resolv.conf/qa diff --git a/inventory/host_vars/s390-koji01.qa.fedoraproject.org b/inventory/host_vars/s390-koji01.qa.fedoraproject.org index 358d51ba37..8637838d24 100644 --- a/inventory/host_vars/s390-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/s390-koji01.qa.fedoraproject.org @@ -40,6 +40,9 @@ koji_weburl: "http://s390.koji.fedoraproject.org/koji" fedmsg_koji_instance: s390 +# Set this to use the qa domain resolv.conf to make sure it can talk to it's db +resolvconf: resolv.conf/qa + # Overload the fedmsg_certs definition from the ansible koji group, since the # s390 hub *also* does compose stuff, not just koji stuff. fedmsg_certs: diff --git a/roles/base/files/resolv.conf/qa b/roles/base/files/resolv.conf/qa new file mode 100644 index 0000000000..5bc8edf5d4 --- /dev/null +++ b/roles/base/files/resolv.conf/qa @@ -0,0 +1,6 @@ +search qa.fedoraproject.org phx2.fedoraproject.org vpn.fedoraproject.org fedoraproject.org +nameserver 10.5.126.21 +nameserver 10.5.126.22 +options rotate timeout:1 + + diff --git a/roles/bodhi/backend/tasks/main.yml b/roles/bodhi/backend/tasks/main.yml index 225fd65505..d4803e3cf5 100644 --- a/roles/bodhi/backend/tasks/main.yml +++ b/roles/bodhi/backend/tasks/main.yml @@ -219,3 +219,8 @@ when: inventory_hostname.startswith('bodhi-backend02') and env == "production" tags: - config + +- name: setup cache directory for package signing by releng + file: state=directory mode=770 owner=masher group=sysadmin-releng path=/var/cache/sigul + tags: + - config