From 44b0b7bf91f070ab21b1393b07ac1b033c62b6f7 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 13 Nov 2014 21:27:22 +0000 Subject: [PATCH] Copy in a mash config. --- inventory/group_vars/arm-releng | 1 + .../host_vars/branched-composer.phx2.fedoraproject.org | 1 + inventory/host_vars/composer.stg.phx2.fedoraproject.org | 1 + inventory/host_vars/rawhide-composer.phx2.fedoraproject.org | 1 + roles/releng/tasks/main.yml | 3 +++ roles/releng/templates/mash.conf | 6 ++++++ 6 files changed, 13 insertions(+) create mode 100644 roles/releng/templates/mash.conf diff --git a/inventory/group_vars/arm-releng b/inventory/group_vars/arm-releng index 909ba1c036..3d765fcb76 100644 --- a/inventory/group_vars/arm-releng +++ b/inventory/group_vars/arm-releng @@ -10,3 +10,4 @@ sudoers: "{{ private }}/files/sudo/arm-releng-sudoers" # For the mock config kojipkgs_url: kojipkgs.fedoraproject.org +kojihub_url: koji.fedoraproject.org/kojihub diff --git a/inventory/host_vars/branched-composer.phx2.fedoraproject.org b/inventory/host_vars/branched-composer.phx2.fedoraproject.org index 6e0c0ff028..61443cd6fb 100644 --- a/inventory/host_vars/branched-composer.phx2.fedoraproject.org +++ b/inventory/host_vars/branched-composer.phx2.fedoraproject.org @@ -5,6 +5,7 @@ eth1_ip: 10.5.127.53 volgroup: /dev/vg_bvirthost08 kojipkgs_url: kojipkgs.fedoraproject.org +kojihub_url: koji.fedoraproject.org/kojihub # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/host_vars/composer.stg.phx2.fedoraproject.org b/inventory/host_vars/composer.stg.phx2.fedoraproject.org index 5c1734cb85..5a0ddda747 100644 --- a/inventory/host_vars/composer.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/composer.stg.phx2.fedoraproject.org @@ -13,6 +13,7 @@ datacenter: staging fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-fedimg kojipkgs_url: koji.stg.fedoraproject.org +kojihub_url: koji.stg.fedoraproject.org/kojihub nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4 diff --git a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org index 7ddae08f99..56db2a45bc 100644 --- a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org +++ b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org @@ -4,6 +4,7 @@ eth1_ip: 10.5.127.54 volgroup: /dev/vg_bvirthost06 kojipkgs_url: kojipkgs.fedoraproject.org +kojihub_url: koji.fedoraproject.org/kojihub # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index a11a389f2b..9b5aeb7159 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -41,6 +41,9 @@ - name: add masher koji ca cert action: copy src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-server-ca.cert +- name: copy over our mash.conf + template: src=mash.conf dest=/etc/mash/mash.conf + # rawhide group - name: rawhide group action: group name=rawhide gid=265 diff --git a/roles/releng/templates/mash.conf b/roles/releng/templates/mash.conf new file mode 100644 index 0000000000..2e2736e67a --- /dev/null +++ b/roles/releng/templates/mash.conf @@ -0,0 +1,6 @@ +[defaults] +configdir = /etc/mash +buildhost = https://{{kojihub_url}} +repodir = file:///mnt/koji +use_sqlite = True +use_repoview = False