diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-07 12:06:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 12:06:03 -0800 |
| commit | d6ea0d5f39637c6e888008621fa0193c0fa049f4 (patch) | |
| tree | abe7f41b27177748f69367780add5308a3507c2e /playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | |
| parent | f3b74371642fac62069cd369331ed18f07febf23 (diff) | |
| parent | e64462aa1dfedbdc9b0bc3fae22e3fcca8f5b83b (diff) | |
| download | openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.tar.gz openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.tar.bz2 openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.tar.xz openshift-d6ea0d5f39637c6e888008621fa0193c0fa049f4.zip | |
Merge pull request #6371 from mtnbikenc/include-to-import_playbook
Automatic merge from submit-queue.
Include Deprecation: Convert to import_playbook
* Converts playbooks/ to use `import_playbook`.
* Updates remaining `include:` tasks to `include_tasks:`
Trello: https://trello.com/c/ZTyZu3UM/484-3-ansible-24-include-deprecation
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml index 4aa63d757..37fc8a0f6 100644 --- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml +++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml @@ -17,7 +17,7 @@ embedded_etcd: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}" - name: Backup and upgrade etcd - include: ../../../openshift-etcd/private/upgrade_main.yml + import_playbook: ../../../openshift-etcd/private/upgrade_main.yml # Create service signer cert when missing. Service signer certificate # is added to master config in the master_config_upgrade hook. @@ -30,7 +30,7 @@ register: service_signer_cert_stat changed_when: false -- include: create_service_signer_cert.yml +- import_playbook: create_service_signer_cert.yml # oc adm migrate storage should be run prior to etcd v3 upgrade # See: https://github.com/openshift/origin/pull/14625#issuecomment-308467060 @@ -71,7 +71,7 @@ - debug: msg="Running master pre-upgrade hook {{ openshift_master_upgrade_pre_hook }}" when: openshift_master_upgrade_pre_hook is defined - - include: "{{ openshift_master_upgrade_pre_hook }}" + - include_tasks: "{{ openshift_master_upgrade_pre_hook }}" when: openshift_master_upgrade_pre_hook is defined - include_role: @@ -82,20 +82,20 @@ - debug: msg="Running master upgrade hook {{ openshift_master_upgrade_hook }}" when: openshift_master_upgrade_hook is defined - - include: "{{ openshift_master_upgrade_hook }}" + - include_tasks: "{{ openshift_master_upgrade_hook }}" when: openshift_master_upgrade_hook is defined - - include: ../../../openshift-master/private/tasks/restart_hosts.yml + - include_tasks: ../../../openshift-master/private/tasks/restart_hosts.yml when: openshift.common.rolling_restart_mode == 'system' - - include: ../../../openshift-master/private/tasks/restart_services.yml + - include_tasks: ../../../openshift-master/private/tasks/restart_services.yml when: openshift.common.rolling_restart_mode == 'services' # Run the post-upgrade hook if defined: - debug: msg="Running master post-upgrade hook {{ openshift_master_upgrade_post_hook }}" when: openshift_master_upgrade_post_hook is defined - - include: "{{ openshift_master_upgrade_post_hook }}" + - include_tasks: "{{ openshift_master_upgrade_post_hook }}" when: openshift_master_upgrade_post_hook is defined - name: Post master upgrade - Upgrade clusterpolicies storage @@ -275,7 +275,7 @@ roles: - openshift_facts tasks: - - include: docker/tasks/upgrade.yml + - include_tasks: docker/tasks/upgrade.yml when: l_docker_upgrade is defined and l_docker_upgrade | bool and not openshift.common.is_atomic | bool - name: Drain and upgrade master nodes |