Merge pull request #6282 from mtnbikenc/fix-include_role

Correct usage of include_role

playbooks/aws/openshift-cluster/accept.yml

@@ -14,7 +14,7 @@
       msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}"
 
   - name: bring lib_openshift into scope
-    include_role:
+    import_role:
       name: lib_openshift
 
   - name: fetch masters

playbooks/common/openshift-cluster/upgrades/post_control_plane.yml

@@ -14,8 +14,9 @@
 
   pre_tasks:
   - name: Load lib_openshift modules
-    include_role:
+    import_role:
       name: lib_openshift
+
   - name: Collect all routers
     oc_obj:
       state: list

playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml

@@ -291,7 +291,7 @@
 
   pre_tasks:
   - name: Load lib_openshift modules
-    include_role:
+    import_role:
       name: lib_openshift
 
   # TODO: To better handle re-trying failed upgrades, it would be nice to check if the node

playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml

@@ -8,7 +8,7 @@
 
   pre_tasks:
   - name: Load lib_openshift modules
-    include_role:
+    import_role:
       name: lib_openshift
 
   # TODO: To better handle re-trying failed upgrades, it would be nice to check if the node

roles/openshift_management/tasks/add_container_provider.yml

@@ -1,8 +1,4 @@
 ---
-- name: Ensure lib_openshift modules are available
-  include_role:
-    role: lib_openshift
-
 - name: Ensure OpenShift facts module is available
   include_role:
     role: openshift_facts