From 7bbcf534c7cabeea042bcab5a8256e549a5b9102 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 8 Mar 2017 22:12:14 +0000 Subject: [PATCH] try and add in new ppc64/ppc64le builders with no nfs/createrepo for now --- inventory/group_vars/all | 3 +++ inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org | 1 + inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org | 1 + inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org | 1 + inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org | 1 + inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org | 1 + inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org | 1 + playbooks/groups/buildvm.yml | 2 +- 8 files changed, 10 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 163a649c97..0f1ad44068 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -238,3 +238,6 @@ collectd_apache: true # assume vpn is false vpn: False + +# assume createrepo is true and this builder has the koji nfs mount to do that +createrepo: True diff --git a/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org index 4f1dbedad6..80d38cd766 100644 --- a/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-11.ppc.fedoraproject.org @@ -5,3 +5,4 @@ eth1_ip: 10.5.127.118 # This is a lie, but the Power64 kernel/qemu/libvirt flips the eth0/eth1 main_bridge: br1 nfs_bridge: br0 +createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org index 03926992df..14fbfbc399 100644 --- a/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-12.ppc.fedoraproject.org @@ -5,3 +5,4 @@ eth1_ip: 10.5.127.119 # This is a lie, but the Power64 kernel/qemu/libvirt flips the eth0/eth1 main_bridge: br1 nfs_bridge: br0 +createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org index e725c93efc..4e92132647 100644 --- a/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64-13.ppc.fedoraproject.org @@ -5,3 +5,4 @@ eth1_ip: 10.5.127.120 # This is a lie, but the Power64 kernel/qemu/libvirt flips the eth0/eth1 main_bridge: br1 nfs_bridge: br0 +createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org index 7b150d49a8..34afa7e6ff 100644 --- a/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-11.ppc.fedoraproject.org @@ -5,3 +5,4 @@ eth1_ip: 10.5.127.136 # This is a lie, but the Power64 kernel/qemu/libvirt flips the eth0/eth1 main_bridge: br1 nfs_bridge: br0 +createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org index f4a26be8ae..248ecb5657 100644 --- a/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-12.ppc.fedoraproject.org @@ -5,3 +5,4 @@ eth1_ip: 10.5.127.137 # This is a lie, but the Power64 kernel/qemu/libvirt flips the eth0/eth1 main_bridge: br1 nfs_bridge: br0 +createrepo: False diff --git a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org index f2ea9952ad..8986b1e305 100644 --- a/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org +++ b/inventory/host_vars/buildvm-ppc64le-13.ppc.fedoraproject.org @@ -5,3 +5,4 @@ eth1_ip: 10.5.127.138 # This is a lie, but the Power64 kernel/qemu/libvirt flips the eth0/eth1 main_bridge: br1 nfs_bridge: br0 +createrepo: False diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index c4bf699dcf..19f60876b9 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -22,7 +22,7 @@ - base - hosts - apache - - { role: nfs/client, mnt_dir: '/mnt/fedora_koji', nfs_src_dir: "{{ koji_hub_nfs }}" } + - { role: nfs/client, mnt_dir: '/mnt/fedora_koji', nfs_src_dir: "{{ koji_hub_nfs }}", when: createrepo } - { role: fas_client, when: not inventory_hostname.startswith('bkernel') } - { role: sudo, when: not inventory_hostname.startswith('bkernel') } - koji_builder