summaryrefslogtreecommitdiffstats
path: root/roles/openshift_storage_nfs
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-06 08:48:05 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-06 08:48:05 -0300
commit81cb935e1817df4c633397680e963d635ed42e26 (patch)
treedd595fab3ae4cc8f5d47dcc2297ff34def6f571c /roles/openshift_storage_nfs
parent0514bdffca4e06144f4f81db037490d2c0fede40 (diff)
parent6fb6e059dc50fcdc2480c06cfcf0a45674283725 (diff)
downloadopenshift-81cb935e1817df4c633397680e963d635ed42e26.tar.gz
openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.bz2
openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.xz
openshift-81cb935e1817df4c633397680e963d635ed42e26.zip
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/openshift_storage_nfs')
-rw-r--r--roles/openshift_storage_nfs/defaults/main.yml3
-rw-r--r--roles/openshift_storage_nfs/meta/main.yml3
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_storage_nfs/defaults/main.yml b/roles/openshift_storage_nfs/defaults/main.yml
index df0bb9fd4..7f3c054e7 100644
--- a/roles/openshift_storage_nfs/defaults/main.yml
+++ b/roles/openshift_storage_nfs/defaults/main.yml
@@ -16,6 +16,3 @@ openshift:
options: "*(rw,root_squash)"
volume:
name: "metrics"
-os_firewall_allow:
-- service: nfs
- port: "2049/tcp"
diff --git a/roles/openshift_storage_nfs/meta/main.yml b/roles/openshift_storage_nfs/meta/main.yml
index d675e0750..865865d9c 100644
--- a/roles/openshift_storage_nfs/meta/main.yml
+++ b/roles/openshift_storage_nfs/meta/main.yml
@@ -11,5 +11,8 @@ galaxy_info:
- 7
dependencies:
- role: os_firewall
+ os_firewall_allow:
+ - service: nfs
+ port: "2049/tcp"
- role: openshift_hosted_facts
- role: openshift_repos