diff options
| author | Kevin Fenzi <kevin@scrye.com> | 2014-06-04 18:07:59 +0000 |
|---|---|---|
| committer | Kevin Fenzi <kevin@scrye.com> | 2014-06-04 18:07:59 +0000 |
| commit | 06bd8dfd92c39c6e6eacb6ae62e0b338a5139f88 (patch) | |
| tree | aca35308507da7656a763e64a2598d339578bdf6 | |
| parent | 068c567cd1a3ccca664ae0b91e91a11e48e6d20d (diff) | |
| download | ansible-06bd8dfd92c39c6e6eacb6ae62e0b338a5139f88.tar.gz ansible-06bd8dfd92c39c6e6eacb6ae62e0b338a5139f88.tar.xz ansible-06bd8dfd92c39c6e6eacb6ae62e0b338a5139f88.zip | |
Reorg the nfs role to have client and server as subroles.
| -rw-r--r-- | playbooks/groups/buildhw.yml | 2 | ||||
| -rw-r--r-- | playbooks/groups/buildvm.yml | 2 | ||||
| -rw-r--r-- | playbooks/groups/download.yml | 2 | ||||
| -rw-r--r-- | playbooks/groups/wiki.yml | 4 | ||||
| -rw-r--r-- | roles/nfs/client/files/route-eth1.phx2 (renamed from roles/nfs_client/files/route-eth1.phx2) | 0 | ||||
| -rw-r--r-- | roles/nfs/client/files/route-eth1.rdu (renamed from roles/nfs_client/files/route-eth1.rdu) | 0 | ||||
| -rw-r--r-- | roles/nfs/client/tasks/main.yml (renamed from roles/nfs_client/tasks/main.yml) | 0 |
7 files changed, 5 insertions, 5 deletions
diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index a7e7b6277..3e438aedb 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -14,7 +14,7 @@ roles: - base - - { role: nfs_client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } + - { role: nfs/client, when: inventory_hostname.startswith('build') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } - koji_builder - { role: bkernel, when: inventory_hostname.startswith('bkernel') } diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index c52e201f2..b0f206ebc 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'), mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } - koji_builder tasks: diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index bbe6ffe85..c51a6609a 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -56,7 +56,7 @@ - download - mod_limitipconn - rsyncd - - { role: nfs_client, when: datacenter == "phx2", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } + - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs_client, when: datacenter == "rdu", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } tasks: diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 7d8bc4300..5be804464 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -39,8 +39,8 @@ - fas_client - collectd/base - fedmsg/base - - { role: nfs_client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } - - { role: nfs_client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } + - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app_staging/app/attachments' } + - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } - mediawiki tasks: diff --git a/roles/nfs_client/files/route-eth1.phx2 b/roles/nfs/client/files/route-eth1.phx2 index b94a496bf..b94a496bf 100644 --- a/roles/nfs_client/files/route-eth1.phx2 +++ b/roles/nfs/client/files/route-eth1.phx2 diff --git a/roles/nfs_client/files/route-eth1.rdu b/roles/nfs/client/files/route-eth1.rdu index 6a94e2007..6a94e2007 100644 --- a/roles/nfs_client/files/route-eth1.rdu +++ b/roles/nfs/client/files/route-eth1.rdu diff --git a/roles/nfs_client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index 3bccd8e9d..3bccd8e9d 100644 --- a/roles/nfs_client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml |