Merge pull request #6148 from mtnbikenc/consolidate-openshift-nfs

Playbook Consolidation - openshift-nfs

5 files changed, 1 insertions, 34 deletions

diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 588291878..ad10ba821 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -3,7 +3,7 @@
 
 - include: ../openshift-etcd/config.yml
 
-- include: ../openshift-nfs/config.yml
+- include: ../../openshift-nfs/private/config.yml
   when: groups.oo_nfs_to_config | default([]) | count > 0
 
 - include: ../openshift-loadbalancer/config.yml
diff --git a/playbooks/common/openshift-nfs/config.yml b/playbooks/common/openshift-nfs/config.yml
deleted file mode 100644
index 6ea77e00b..000000000
--- a/playbooks/common/openshift-nfs/config.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- name: NFS Install Checkpoint Start
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set NFS install 'In Progress'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_nfs:
-          status: "In Progress"
-          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
-
-- name: Configure nfs
-  hosts: oo_nfs_to_config
-  roles:
-  - role: os_firewall
-  - role: openshift_storage_nfs
-
-- name: NFS Install Checkpoint End
-  hosts: all
-  gather_facts: false
-  tasks:
-  - name: Set NFS install 'Complete'
-    run_once: true
-    set_stats:
-      data:
-        installer_phase_nfs:
-          status: "Complete"
-          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
diff --git a/playbooks/common/openshift-nfs/filter_plugins b/playbooks/common/openshift-nfs/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/common/openshift-nfs/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-nfs/lookup_plugins b/playbooks/common/openshift-nfs/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/common/openshift-nfs/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
\ No newline at end of file
diff --git a/playbooks/common/openshift-nfs/roles b/playbooks/common/openshift-nfs/roles
deleted file mode 120000
index e2b799b9d..000000000
--- a/playbooks/common/openshift-nfs/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles/
\ No newline at end of file