From f4b01501344a96d83cfbfbace10eeaa9e4001adc Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 3 Jun 2014 19:29:39 +0000 Subject: [PATCH] Try this to not do koji mount in stg --- inventory/group_vars/buildvm-stg | 5 ----- playbooks/groups/buildvm.yml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg index bae52e09a1..130e951bbb 100644 --- a/inventory/group_vars/buildvm-stg +++ b/inventory/group_vars/buildvm-stg @@ -9,7 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/20/Fedora/x86_64/os/ nm: 255.255.255.0 gw: 10.5.126.254 dns: 10.5.126.21 -eth0_ip: 10.5.126.14 virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} --vcpus={{ num_cpus }} -l {{ ks_repo }} -x @@ -22,7 +21,3 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file host_group: kojibuilder - -vmhost: virthost16.phx2.fedoraproject.org -datacenter: phx2 - diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index c52e201f26..556cbb49ab 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -33,7 +33,7 @@ roles: - base - - { role: nfs_client, when: not inventory_hostname.startswith('arm'), mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } + - { role: nfs_client, when: not inventory_hostname.startswith('arm') or env != "staging", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } - koji_builder tasks: