Playbook Consolidation - openshift-nfs

playbooks/aws/openshift-cluster/install.yml

@@ -25,7 +25,7 @@
   include: ../../common/openshift-etcd/config.yml
 
 - name: include nfs
-  include: ../../common/openshift-nfs/config.yml
+  include: ../../openshift-nfs/private/config.yml
   when: groups.oo_nfs_to_config | default([]) | count > 0
 
 - name: include loadbalancer

playbooks/byo/openshift-nfs/config.yml

@@ -1,4 +0,0 @@
----
-- include: ../../init/main.yml
-
-- include: ../../common/openshift-nfs/config.yml

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

playbooks/openshift-nfs/config.yml

@@ -0,0 +1,4 @@
+---
+- include: ../init/main.yml
+
+- include: private/config.yml

roles/installer_checkpoint/README.md

@@ -68,7 +68,7 @@ phase are stored in the `phase_attributes` variable.
             },
             'installer_phase_nfs': {
                 'title': 'NFS Install',
-                'playbook': 'playbooks/byo/openshift-nfs/config.yml'
+                'playbook': 'playbooks/openshift-nfs/config.yml'
             },
             #...
         }

roles/installer_checkpoint/callback_plugins/installer_checkpoint.py

@@ -54,7 +54,7 @@ class CallbackModule(CallbackBase):
             },
             'installer_phase_nfs': {
                 'title': 'NFS Install',
-                'playbook': 'playbooks/byo/openshift-nfs/config.yml'
+                'playbook': 'playbooks/openshift-nfs/config.yml'
             },
             'installer_phase_loadbalancer': {
                 'title': 'Load balancer Install',