Merge pull request #7818 from mgugino-upstream-stage/upgrade-include-import-cleanup

Change include_ to import_ where possible

playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml

@@ -88,7 +88,7 @@
     - l_docker_upgrade_drain_result is failed
     - openshift_upgrade_nodes_drain_timeout | default(0) | int == 0
 
-  - include_tasks: tasks/upgrade.yml
+  - import_tasks: tasks/upgrade.yml
     when:
     - l_docker_upgrade is defined
     - l_docker_upgrade | bool

playbooks/common/openshift-cluster/upgrades/docker/tasks/upgrade.yml

@@ -52,5 +52,5 @@
   register: result
   until: result is succeeded
 
-- include_tasks: restart.yml
+- import_tasks: restart.yml
   when: not skip_docker_restart | default(False) | bool

playbooks/common/openshift-cluster/upgrades/pre/config.yml

@@ -75,7 +75,7 @@
   roles:
   - role: openshift_facts
   tasks:
-  - include_tasks: verify_upgrade_targets.yml
+  - import_tasks: verify_upgrade_targets.yml
 
 - name: Verify docker upgrade targets
   hosts: "{{ l_upgrade_docker_target_hosts }}"

playbooks/openshift-master/private/config.yml

@@ -128,7 +128,7 @@
     when: openshift_use_kuryr | default(false) | bool
 
   - name: setup bootstrap settings
-    include_tasks: tasks/enable_bootstrap.yml
+    import_tasks: tasks/enable_bootstrap.yml
 
   post_tasks:
   - name: Create group for deployment type

playbooks/openshift-master/private/enable_bootstrap.yml

@@ -4,4 +4,4 @@
   gather_facts: no
   tasks:
   - name: include bootstrapping tasks
-    include_tasks: tasks/enable_bootstrap.yml
+    import_tasks: tasks/enable_bootstrap.yml

playbooks/openshift-master/private/upgrade.yml

@@ -44,7 +44,7 @@
 - name: configure vsphere svc account
   hosts: oo_first_master
   tasks:
-  - include_role:
+  - import_role:
       name: openshift_cloud_provider
       tasks_from: vsphere-svc
     when:
@@ -72,7 +72,7 @@
       tasks_from: upgrade.yml
 
   - name: update vsphere provider master config
-    include_role:
+    import_role:
       name: openshift_control_plane
       tasks_from: update-vsphere
     when:
@@ -81,7 +81,7 @@
     - openshift_version | version_compare('3.9', '>=')
 
   - name: Setup and enable bootstrapping options
-    include_tasks: tasks/enable_bootstrap.yml
+    import_tasks: tasks/enable_bootstrap.yml
 
   # Run the upgrade hook prior to restarting services/system if defined:
   - debug: msg="Running master upgrade hook {{ openshift_master_upgrade_hook }}"
@@ -96,10 +96,10 @@
       enabled: false
     when: openshift_rolling_restart_mode | default('services') == 'system'
 
-  - include_tasks: tasks/restart_hosts.yml
+  - import_tasks: tasks/restart_hosts.yml
     when: openshift_rolling_restart_mode | default('services') == 'system'
 
-  - include_tasks: tasks/restart_services.yml
+  - import_tasks: tasks/restart_services.yml
     when: openshift_rolling_restart_mode | default('services') == 'services'
 
   # Run the post-upgrade hook if defined:

roles/openshift_control_plane/tasks/main.yml

@@ -143,7 +143,7 @@
     group: root
     mode: 0600
 
-- include_tasks: set_loopback_context.yml
+- import_tasks: set_loopback_context.yml
 
 - name: Create the master service env file
   template:
@@ -151,7 +151,7 @@
     dest: /etc/origin/master/master.env
     backup: true
 
-- include_tasks: static.yml
+- import_tasks: static.yml
 
 - name: Start and enable self-hosting node
   systemd:
@@ -230,4 +230,4 @@
     msg: Control plane install failed.
   when: control_plane_health.stdout != 'ok'
 
-- include_tasks: bootstrap.yml
+- import_tasks: bootstrap.yml

roles/openshift_control_plane/tasks/update-vsphere.yml

@@ -0,0 +1,20 @@
+---
+- name: modify controller args
+  yedit:
+    src: /etc/origin/master/master-config.yaml
+    edits:
+    - key: kubernetesMasterConfig.controllerArguments.cloud-config
+      value:
+      - "{{ openshift.common.config_base }}/cloudprovider/vsphere.conf"
+    - key: kubernetesMasterConfig.controllerArguments.cloud-provider
+      value:
+      - vsphere
+    - key: kubernetesMasterConfig.apiServerArguments.cloud-config
+      value:
+      - "{{ openshift.common.config_base }}/cloudprovider/vsphere.conf"
+    - key: kubernetesMasterConfig.apiServerArguments.cloud-provider
+      value:
+      - vsphere
+  notify:
+  - restart master controllers
+  - restart master api

roles/openshift_control_plane/tasks/upgrade.yml

@@ -1,16 +1,16 @@
 ---
-- include_tasks: upgrade/rpm_upgrade.yml
+- import_tasks: upgrade/rpm_upgrade.yml
   when: not openshift_is_containerized | bool
 
-- include_tasks: upgrade/upgrade_scheduler.yml
+- import_tasks: upgrade/upgrade_scheduler.yml
 
 # master_config_hook is passed in from upgrade play.
 - include_tasks: "upgrade/{{ master_config_hook }}"
   when: master_config_hook is defined
 
-- include_tasks: systemd_units.yml
+- import_tasks: systemd_units.yml
 
-- include_tasks: set_loopback_context.yml
+- import_tasks: set_loopback_context.yml
 
 - name: Check for ca-bundle.crt
   stat:

roles/openshift_control_plane/tasks/upgrade/upgrade_scheduler.yml

@@ -1,9 +1,9 @@
 ---
 # Upgrade predicates
-- include_tasks: upgrade_predicates.yml
+- import_tasks: upgrade_predicates.yml
 
 # Upgrade priorities
-- include_tasks: upgrade_priorities.yml
+- import_tasks: upgrade_priorities.yml
 
 # Update scheduler
 - name: Update scheduler config