From 1943ecf491a9966540634f97bfc28d7e2e0529fd Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 22 Jul 2015 16:56:15 +0000 Subject: [PATCH] Fix datacenter for bodhi02.stg revert playbook change --- inventory/host_vars/bodhi02.stg.phx2.fedoraproject.org | 1 - playbooks/groups/bodhi2.yml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/inventory/host_vars/bodhi02.stg.phx2.fedoraproject.org b/inventory/host_vars/bodhi02.stg.phx2.fedoraproject.org index f394bfb21d..6ed880e506 100644 --- a/inventory/host_vars/bodhi02.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi02.stg.phx2.fedoraproject.org @@ -7,7 +7,6 @@ ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ volgroup: /dev/vg_guests eth0_ip: 10.5.126.169 vmhost: virthost10.phx2.fedoraproject.org -datacenter: phx2 # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index d60ce59b0d..991b8a17d7 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -24,7 +24,6 @@ - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - roles: - base - rkhunter @@ -40,7 +39,7 @@ - apache - { role: bodhi2/base, when: "inventory_hostname.startswith('bodhi0')" } - { role: fedmsg/base, when: "inventory_hostname.startswith('bodhi0')" } - - { role: nfs/client, when: "inventory_hostname.startswith('bodhi02.stg')", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } + - { role: nfs/client, when: datacenter == 'staging', mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } tasks: - include: "{{ tasks }}/yumrepos.yml"