From 2454e84d0960546ef765bacf762283d87623cbd0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 21 Apr 2014 19:00:03 +0000 Subject: [PATCH] Stab at using nfs_client role for nfs mounts --- files/hosts/wiki01.stg.phx2.fedoraproject.org | 7 +++++++ playbooks/groups/wiki.yml | 2 ++ roles/mediawiki/tasks/main.yml | 8 -------- 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 files/hosts/wiki01.stg.phx2.fedoraproject.org diff --git a/files/hosts/wiki01.stg.phx2.fedoraproject.org b/files/hosts/wiki01.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..f4ec944f54 --- /dev/null +++ b/files/hosts/wiki01.stg.phx2.fedoraproject.org @@ -0,0 +1,7 @@ +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +10.5.126.89 admin.fedoraproject.org +10.5.126.88 proxy01.phx2.fedoraproject.org proxy1 proxy2 proxy3 proxy4 proxy01 proxy02 proxy03 proxy04 fedoraproject.org +10.5.126.86 fas01.phx2.fedoraproject.org fas1 fas2 fas01 fas02 fas03 fas-all +10.5.126.23 infrastructure.fedoraproject.org diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 1a05d4e273..05ec7916e8 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -38,6 +38,8 @@ - nagios_client - fas_client - fedmsg/base + - { role: nfs_client, when: env == "staging", mnt_dir: '/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } + - { role: nfs_client, when: env != "staging", mnt_dir: '/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } - mediawiki tasks: diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml index db17801cfe..24e1408511 100644 --- a/roles/mediawiki/tasks/main.yml +++ b/roles/mediawiki/tasks/main.yml @@ -32,14 +32,6 @@ - name: startup apache service: name=httpd enabled=yes state=started -- name: mount staging attachments - mount: name=/srv/web/attachments src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_app_staging/app/attachments fstype=nfs opts=defaults,rw,hard,intr,nfsvers=3 state=mounted - when: env == "staging" - -- name: mount attachments - mount: name=/srv/web/attachments src=vtap-fedora-nfs01.storage.phx2.redhat.com:/vol/fedora_app/app/attachments fstype=nfs opts=defaults,rw,hard,intr,nfsvers=3 state=mounted - when: env != "staging" - - name: Fedora branding copy: src=skins/ dest=/usr/share/mediawiki119/skins owner=root group=root mode=775 tags: