From 44e5ddc20e7069e5345f48426a69e725aa8ea1d4 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Tue, 19 Jan 2016 14:50:55 -0500
Subject: Refactor registry storage options.

---
 roles/openshift_storage_nfs/tasks/main.yml | 34 +++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 12 deletions(-)

(limited to 'roles/openshift_storage_nfs/tasks/main.yml')

diff --git a/roles/openshift_storage_nfs/tasks/main.yml b/roles/openshift_storage_nfs/tasks/main.yml
index 64b121ade..770294eba 100644
--- a/roles/openshift_storage_nfs/tasks/main.yml
+++ b/roles/openshift_storage_nfs/tasks/main.yml
@@ -1,31 +1,41 @@
 ---
-- name: Set nfs facts
-  openshift_facts:
-    role: nfs
-    local_facts:
-      exports_dir: "{{ openshift_nfs_exports_dir | default(None) }}"
-      export_options: "{{ openshift_nfs_export_options | default(None) }}"
-      registry_volume: "{{ openshift_nfs_registry_volume | default(None) }}"
-
 - name: Install nfs-utils
   yum:
     pkg: nfs-utils
     state: present
 
+- name: Configure NFS
+  lineinfile:
+    dest: /etc/sysconfig/nfs
+    regexp: "{{ item.regex }}"
+    line: "{{ item.line }}"
+  register: nfs_config
+  with_items:
+  - regex: '^RPCNFSDARGS=.*$'
+    line: 'RPCNFSDARGS="-N 2 -N 3"'
+  - regex: '^RPCMOUNTDOPTS=.*$'
+    line: 'RPCMOUNTDOPTS="-p 20048"'
+  - regex: '^STATDARG=.*$'
+    line: 'STATDARG="-p 50825"'
+
+- name: Restart nfs-config
+  service: name=nfs-config state=restarted
+  when: "True in (nfs_config.results | oo_collect(attribute='changed') | list)"
+
 - name: Ensure exports directory exists
   file:
-    path: "{{ openshift.nfs.exports_dir }}"
+    path: "{{ openshift.hosted.registry.storage.nfs.directory }}"
     state: directory
 
 - name: Ensure export directories exist
   file:
-    path: "{{ openshift.nfs.exports_dir }}/{{ item }}"
+    path: "{{ openshift.hosted.registry.storage.nfs.directory }}/{{ item }}"
     state: directory
     mode: 0777
     owner: nfsnobody
     group: nfsnobody
   with_items:
-  - "{{ openshift.nfs.registry_volume }}"
+  - "{{ openshift.hosted.registry.storage.volume.name }}"
 
 - name: Configure exports
   template:
@@ -45,5 +55,5 @@
 
 - set_fact:
     nfs_service_status_changed: "{{ True in (start_result.results
-                                    | map(attribute='changed')
+                                    | oo_collect(attribute='changed')
                                     | list) }}"
-- 
cgit v1.2.1