Playbook Consolidation - openshift-provisioners

playbooks/byo/openshift-cluster/openshift-provisioners.yml

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

playbooks/openshift-provisioners/config.yml

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

playbooks/openshift-provisioners/private/roles

@@ -0,0 +1 @@
+../../../roles

roles/openshift_provisioners/tasks/install_provisioners.yaml

@@ -16,10 +16,10 @@
   when: (openshift_provisioners_efs | bool) and openshift_provisioners_efs_aws_secret_access_key is not defined
 
 - name: Install support
-  include: install_support.yaml
+  include_tasks: install_support.yaml
 
 - name: Install EFS
-  include: install_efs.yaml
+  include_tasks: install_efs.yaml
   when: openshift_provisioners_efs | bool
 
 - find: paths={{ mktemp.stdout }}/templates patterns=*.yaml
@@ -32,7 +32,7 @@
   changed_when: no
 
 - name: Create objects
-  include: oc_apply.yaml
+  include_tasks: oc_apply.yaml
   vars:
     - kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
     - namespace: "{{ openshift_provisioners_project }}"
@@ -51,5 +51,5 @@
   when: ansible_check_mode
 
 - name: Scaling up cluster
-  include: start_cluster.yaml
+  include_tasks: start_cluster.yaml
   when: start_cluster | default(true) | bool

roles/openshift_provisioners/tasks/install_support.yaml

@@ -10,8 +10,8 @@
   changed_when: False
   check_mode: no
 
-- include: generate_secrets.yaml
+- include_tasks: generate_secrets.yaml
 
-- include: generate_clusterrolebindings.yaml
+- include_tasks: generate_clusterrolebindings.yaml
 
-- include: generate_serviceaccounts.yaml
+- include_tasks: generate_serviceaccounts.yaml

roles/openshift_provisioners/tasks/main.yaml

@@ -12,10 +12,10 @@
   check_mode: no
   tags: provisioners_init
 
-- include: "{{ role_path }}/tasks/install_provisioners.yaml"
+- include_tasks: install_provisioners.yaml
   when: openshift_provisioners_install_provisioners | default(false) | bool
 
-- include: "{{ role_path }}/tasks/uninstall_provisioners.yaml"
+- include_tasks: uninstall_provisioners.yaml
   when: not openshift_provisioners_install_provisioners | default(false) | bool
 
 - name: Delete temp directory

roles/openshift_provisioners/tasks/uninstall_provisioners.yaml

@@ -1,6 +1,6 @@
 ---
 - name: stop provisioners
-  include: stop_cluster.yaml
+  include_tasks: stop_cluster.yaml
 
 # delete the deployment objects that we had created
 - name: delete provisioner api objects