From 596abe006140c2a1bd125aca11754ed3b7ba548d Mon Sep 17 00:00:00 2001
From: Scott Weiss <sdw35@cornell.edu>
Date: Thu, 3 Aug 2017 12:21:07 -0400
Subject: nfs only run if cloud_provider not defined

---
 roles/openshift_cfme/tasks/main.yml | 44 +++----------------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

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

diff --git a/roles/openshift_cfme/tasks/main.yml b/roles/openshift_cfme/tasks/main.yml
index 3325ee4a7..74ae16d91 100644
--- a/roles/openshift_cfme/tasks/main.yml
+++ b/roles/openshift_cfme/tasks/main.yml
@@ -24,48 +24,10 @@
 
 ######################################################################
 # NFS
+# In the case that we are not running on a cloud provider, volumes must be statically provisioned
 
-- name: Ensure the /exports/ directory exists
-  file:
-    path: /exports/
-    state: directory
-    mode: 0755
-    owner: root
-    group: root
-
-- name: Ensure the miq-pv0X export directories exist
-  file:
-    path: "/exports/{{ item }}"
-    state: directory
-    mode: 0775
-    owner: root
-    group: root
-  with_items: "{{ openshift_cfme_pv_exports }}"
-
-- name: Ensure the NFS exports for CFME PVs exist
-  copy:
-    src: openshift_cfme.exports
-    dest: /etc/exports.d/openshift_cfme.exports
-  register: nfs_exports_updated
-
-- name: Ensure the NFS export table is refreshed if exports were added
-  command: exportfs -ar
-  when:
-    - nfs_exports_updated.changed
-
-
-######################################################################
-# Create the required CFME PVs. Check out these online docs if you
-# need a refresher on includes looping with items:
-# * http://docs.ansible.com/ansible/playbooks_loops.html#loops-and-includes-in-2-0
-# * http://stackoverflow.com/a/35128533
-#
-# TODO: Handle the case where a PV template is updated in
-# openshift-ansible and the change needs to be landed on the managed
-# cluster.
-
-- include: create_pvs.yml
-  with_items: "{{ openshift_cfme_pv_data }}"
+- include: nfs.yml
+  when: not (openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce'))
 
 ######################################################################
 # CFME App Template
-- 
cgit v1.2.3