From cf42ac7ae009f821ecb45b8818361827260674d2 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 6 Nov 2014 19:31:49 +0000 Subject: [PATCH] Make kojipkgs_url a var. --- inventory/host_vars/branched-composer.phx2.fedoraproject.org | 2 ++ inventory/host_vars/composer.stg.phx2.fedoraproject.org | 2 ++ inventory/host_vars/rawhide-composer.phx2.fedoraproject.org | 2 ++ roles/releng/templates/fedora-branched-compose-armhfp.cfg | 4 ++-- roles/releng/templates/fedora-branched-compose-i386.cfg | 4 ++-- roles/releng/templates/fedora-branched-compose-x86_64.cfg | 4 ++-- roles/releng/templates/fedora-rawhide-compose-armhfp.cfg | 4 ++-- roles/releng/templates/fedora-rawhide-compose-i386.cfg | 4 ++-- roles/releng/templates/fedora-rawhide-compose-x86_64.cfg | 4 ++-- 9 files changed, 18 insertions(+), 12 deletions(-) diff --git a/inventory/host_vars/branched-composer.phx2.fedoraproject.org b/inventory/host_vars/branched-composer.phx2.fedoraproject.org index 9c31ec0196..6e0c0ff028 100644 --- a/inventory/host_vars/branched-composer.phx2.fedoraproject.org +++ b/inventory/host_vars/branched-composer.phx2.fedoraproject.org @@ -4,6 +4,8 @@ eth0_ip: 10.5.125.66 eth1_ip: 10.5.127.53 volgroup: /dev/vg_bvirthost08 +kojipkgs_url: kojipkgs.fedoraproject.org + # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/inventory/host_vars/composer.stg.phx2.fedoraproject.org b/inventory/host_vars/composer.stg.phx2.fedoraproject.org index 44db539536..5c1734cb85 100644 --- a/inventory/host_vars/composer.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/composer.stg.phx2.fedoraproject.org @@ -12,6 +12,8 @@ datacenter: staging fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-fedimg +kojipkgs_url: koji.stg.fedoraproject.org + nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4 # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org index 0f26accad0..7ddae08f99 100644 --- a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org +++ b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org @@ -3,6 +3,8 @@ eth0_ip: 10.5.125.69 eth1_ip: 10.5.127.54 volgroup: /dev/vg_bvirthost06 +kojipkgs_url: kojipkgs.fedoraproject.org + # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/roles/releng/templates/fedora-branched-compose-armhfp.cfg b/roles/releng/templates/fedora-branched-compose-armhfp.cfg index 53bd79d964..0380ef77f3 100644 --- a/roles/releng/templates/fedora-branched-compose-armhfp.cfg +++ b/roles/releng/templates/fedora-branched-compose-armhfp.cfg @@ -26,13 +26,13 @@ assumeyes=1 [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/branched/armhfp/os +baseurl=http://{{kojipkgs_url}}/mash/branched/armhfp/os enabled=1 cost=5000 [static] name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/armhfp +baseurl=http://{{kojipkgs_url}}/repos/f21-build/latest/armhfp enabled=1 #cost=2000 """ diff --git a/roles/releng/templates/fedora-branched-compose-i386.cfg b/roles/releng/templates/fedora-branched-compose-i386.cfg index aa4a886827..8aed06403b 100644 --- a/roles/releng/templates/fedora-branched-compose-i386.cfg +++ b/roles/releng/templates/fedora-branched-compose-i386.cfg @@ -26,13 +26,13 @@ assumeyes=1 [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/branched/i386/os +baseurl=http://{{kojipkgs_url}}/mash/branched/i386/os enabled=1 cost=5000 [static] name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/i386 +baseurl=http://{{kojipkgs_url}}/repos/f21-build/latest/i386 enabled=1 #cost=2000 """ diff --git a/roles/releng/templates/fedora-branched-compose-x86_64.cfg b/roles/releng/templates/fedora-branched-compose-x86_64.cfg index f183c923a0..70c36e3f7b 100644 --- a/roles/releng/templates/fedora-branched-compose-x86_64.cfg +++ b/roles/releng/templates/fedora-branched-compose-x86_64.cfg @@ -26,13 +26,13 @@ assumeyes=1 [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/branched/x86_64/os +baseurl=http://{{kojipkgs_url}}/mash/branched/x86_64/os enabled=1 cost=5000 [static] name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/f21-build/latest/x86_64 +baseurl=http://{{kojipkgs_url}}/repos/f21-build/latest/x86_64 enabled=1 #cost=2000 """ diff --git a/roles/releng/templates/fedora-rawhide-compose-armhfp.cfg b/roles/releng/templates/fedora-rawhide-compose-armhfp.cfg index 2fc304b49d..0c768e4a53 100644 --- a/roles/releng/templates/fedora-rawhide-compose-armhfp.cfg +++ b/roles/releng/templates/fedora-rawhide-compose-armhfp.cfg @@ -25,13 +25,13 @@ assumeyes=1 [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/armhfp/os +baseurl=http://{{kojipkgs_url}}/mash/rawhide/armhfp/os enabled=1 cost=5000 [static] name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/armhfp +baseurl=http://{{kojipkgs_url}}/repos/rawhide/latest/armhfp enabled=1 #cost=2000 """ diff --git a/roles/releng/templates/fedora-rawhide-compose-i386.cfg b/roles/releng/templates/fedora-rawhide-compose-i386.cfg index 410f458f3e..d7b42ccf6f 100644 --- a/roles/releng/templates/fedora-rawhide-compose-i386.cfg +++ b/roles/releng/templates/fedora-rawhide-compose-i386.cfg @@ -25,13 +25,13 @@ assumeyes=1 [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/i386/os +baseurl=http://{{kojipkgs_url}}/mash/rawhide/i386/os enabled=1 cost=5000 [static] name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/i386 +baseurl=http://{{kojipkgs_url}}/repos/rawhide/latest/i386 enabled=1 #cost=2000 """ diff --git a/roles/releng/templates/fedora-rawhide-compose-x86_64.cfg b/roles/releng/templates/fedora-rawhide-compose-x86_64.cfg index c20a4d670b..be7ff5b99d 100644 --- a/roles/releng/templates/fedora-rawhide-compose-x86_64.cfg +++ b/roles/releng/templates/fedora-rawhide-compose-x86_64.cfg @@ -25,13 +25,13 @@ assumeyes=1 [fedora] name=fedora -baseurl=http://kojipkgs.fedoraproject.org/mash/rawhide/x86_64/os +baseurl=http://{{kojipkgs_url}}/mash/rawhide/x86_64/os enabled=1 cost=5000 [static] name=static -baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64 +baseurl=http://{{kojipkgs_url}}/repos/rawhide/latest/x86_64 enabled=1 #cost=2000 """