From f1c55218d00eb4108b374c54f33ab502a7353df1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 25 May 2020 09:03:59 -0700 Subject: [PATCH] iad2: koji/kojipkgs: add to iad2. Signed-off-by: Kevin Fenzi --- .../host_vars/koji01.iad2.fedoraproject.org | 22 +++++++++++++++++++ .../host_vars/koji02.iad2.fedoraproject.org | 19 ++++++++++++++++ .../kojipkgs01.iad2.fedoraproject.org | 17 ++++++++++++++ .../kojipkgs02.iad2.fedoraproject.org | 17 ++++++++++++++ inventory/inventory | 8 +++++++ playbooks/groups/koji-hub.yml | 2 +- 6 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 inventory/host_vars/koji01.iad2.fedoraproject.org create mode 100644 inventory/host_vars/koji02.iad2.fedoraproject.org create mode 100644 inventory/host_vars/kojipkgs01.iad2.fedoraproject.org create mode 100644 inventory/host_vars/kojipkgs02.iad2.fedoraproject.org diff --git a/inventory/host_vars/koji01.iad2.fedoraproject.org b/inventory/host_vars/koji01.iad2.fedoraproject.org new file mode 100644 index 0000000000..f8c9d1edff --- /dev/null +++ b/inventory/host_vars/koji01.iad2.fedoraproject.org @@ -0,0 +1,22 @@ +--- +nm: 255.255.255.0 +gw: 10.3.169.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8 +ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: 10.3.169.104 +vmhost: bvmhost-02.iad2.fedoraproject.org +datacenter: iad2 + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +fedmsg_koji_instance: primary + +koji_topurl: "https://kojipkgs.fedoraproject.org/" +koji_server_url: "https://koji.fedoraproject.org/kojihub" +koji_weburl: "https://koji.fedoraproject.org/koji" + +# we need sftp here in order to support the sshfs mount on buildvm-s390x-01 +sshd_sftp: true diff --git a/inventory/host_vars/koji02.iad2.fedoraproject.org b/inventory/host_vars/koji02.iad2.fedoraproject.org new file mode 100644 index 0000000000..9265fd8645 --- /dev/null +++ b/inventory/host_vars/koji02.iad2.fedoraproject.org @@ -0,0 +1,19 @@ +--- +nm: 255.255.255.0 +gw: 10.3.169.254 +dns: 10.3.163.33 +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-8 +ks_repo: http://10.3.163.35/repo/rhel/RHEL8-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: 10.3.169.105 +vmhost: bvmhost-x86-03.iad2.fedoraproject.org +datacenter: iad2 + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 + +fedmsg_koji_instance: primary + +koji_topurl: "https://kojipkgs.fedoraproject.org/" +koji_server_url: "https://koji.fedoraproject.org/kojihub" +koji_weburl: "https://koji.fedoraproject.org/koji" diff --git a/inventory/host_vars/kojipkgs01.iad2.fedoraproject.org b/inventory/host_vars/kojipkgs01.iad2.fedoraproject.org new file mode 100644 index 0000000000..9c2238458e --- /dev/null +++ b/inventory/host_vars/kojipkgs01.iad2.fedoraproject.org @@ -0,0 +1,17 @@ +--- +nm: 255.255.255.0 +gw: 10.3.169.254 +dns: 10.3.163.33 + +volgroup: /dev/vg_guests + +eth0_ip: 10.3.169.106 + +vmhost: bvmhost-x86-04.iad2.fedoraproject.org +datacenter: iad2 + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 diff --git a/inventory/host_vars/kojipkgs02.iad2.fedoraproject.org b/inventory/host_vars/kojipkgs02.iad2.fedoraproject.org new file mode 100644 index 0000000000..0ee7151e5d --- /dev/null +++ b/inventory/host_vars/kojipkgs02.iad2.fedoraproject.org @@ -0,0 +1,17 @@ +--- +nm: 255.255.255.0 +gw: 10.3.169.254 +dns: 10.3.163.33 + +volgroup: /dev/vg_guests + +eth0_ip: 10.3.169.107 + +vmhost: bvmhost-x86-05.iad2.fedoraproject.org +datacenter: phx2 + +ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora-32-iad2 +ks_repo: http://10.3.163.35/pub/fedora/linux/releases/32/Server/x86_64/os/ + +nrpe_procs_warn: 900 +nrpe_procs_crit: 1000 diff --git a/inventory/inventory b/inventory/inventory index a3714b8200..14350fac1f 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -309,6 +309,8 @@ kernel03.qa.fedoraproject.org [koji] koji01.phx2.fedoraproject.org koji02.phx2.fedoraproject.org +koji01.iad2.fedoraproject.org +koji02.iad2.fedoraproject.org [koji_stg] koji01.stg.phx2.fedoraproject.org @@ -316,6 +318,8 @@ koji01.stg.phx2.fedoraproject.org [kojipkgs] kojipkgs01.phx2.fedoraproject.org kojipkgs02.phx2.fedoraproject.org +kojipkgs01.iad2.fedoraproject.org +kojipkgs02.iad2.fedoraproject.org [infracore] batcave01.phx2.fedoraproject.org @@ -1296,6 +1300,10 @@ fedimg01.iad2.fedoraproject.org github2fedmsg01.iad2.fedoraproject.org ipa01.iad2.fedoraproject.org ipa02.iad2.fedoraproject.org +koji01.iad2.fedoraproject.org +koji02.iad2.fedoraproject.org +kojipkgs01.iad2.fedoraproject.org +kojipkgs02.iad2.fedoraproject.org log01.iad2.fedoraproject.org loopabull01.iad2.fedoraproject.org memcached01.iad2.fedoraproject.org diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 66890e7f7e..222bbb446b 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -43,7 +43,7 @@ owner_user: apache host: "koji{{env_suffix}}.fedoraproject.org" - { role: nfs/server, when: env == "staging" } - - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') } + - { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') and datacenter == 'phx2' } - role: nfs/client mnt_dir: '/mnt/fedora_koji' nfs_src_dir: 'fedora_koji'