summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-02-02 13:57:24 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-02-02 13:57:24 -0500
commit657f5d2bed046602df8f1fdab5e415c72706f3ea (patch)
tree475696aaef500672e07fb7f9447c23b8715523d9
parent44e5ddc20e7069e5345f48426a69e725aa8ea1d4 (diff)
downloadopenshift-657f5d2bed046602df8f1fdab5e415c72706f3ea.tar.gz
openshift-657f5d2bed046602df8f1fdab5e415c72706f3ea.tar.bz2
openshift-657f5d2bed046602df8f1fdab5e415c72706f3ea.tar.xz
openshift-657f5d2bed046602df8f1fdab5e415c72706f3ea.zip
Remove extra nfs configuration.
-rw-r--r--roles/openshift_storage_nfs/defaults/main.yml8
-rw-r--r--roles/openshift_storage_nfs/tasks/main.yml13
2 files changed, 3 insertions, 18 deletions
diff --git a/roles/openshift_storage_nfs/defaults/main.yml b/roles/openshift_storage_nfs/defaults/main.yml
index 9f6c436cc..5f6893129 100644
--- a/roles/openshift_storage_nfs/defaults/main.yml
+++ b/roles/openshift_storage_nfs/defaults/main.yml
@@ -12,11 +12,3 @@ os_firewall_use_firewalld: False
os_firewall_allow:
- service: nfs
port: "2049/tcp"
-- service: portmapper
- port: "111/tcp"
-- service: mount lock daemon
- port: "20048/tcp"
-- service: status
- port: "50825/tcp"
-- service: frsrpc
- port: "53248/tcp"
diff --git a/roles/openshift_storage_nfs/tasks/main.yml b/roles/openshift_storage_nfs/tasks/main.yml
index 770294eba..6429c66e8 100644
--- a/roles/openshift_storage_nfs/tasks/main.yml
+++ b/roles/openshift_storage_nfs/tasks/main.yml
@@ -7,20 +7,13 @@
- name: Configure NFS
lineinfile:
dest: /etc/sysconfig/nfs
- regexp: "{{ item.regex }}"
- line: "{{ item.line }}"
- register: nfs_config
- with_items:
- - regex: '^RPCNFSDARGS=.*$'
+ regexp: '^RPCNFSDARGS=.*$'
line: 'RPCNFSDARGS="-N 2 -N 3"'
- - regex: '^RPCMOUNTDOPTS=.*$'
- line: 'RPCMOUNTDOPTS="-p 20048"'
- - regex: '^STATDARG=.*$'
- line: 'STATDARG="-p 50825"'
+ register: nfs_config
- name: Restart nfs-config
service: name=nfs-config state=restarted
- when: "True in (nfs_config.results | oo_collect(attribute='changed') | list)"
+ when: nfs_config | changed
- name: Ensure exports directory exists
file: