diff options
author | Russell Teague <rteague@redhat.com> | 2017-11-22 16:36:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-22 16:36:45 -0500 |
commit | 4e6df8801fcb627804b1f4075d25da6d38b49639 (patch) | |
tree | 7e0a9877fb859aacbfa6af17b627d6214db16f76 /roles/openshift_master/tasks/upgrade.yml | |
parent | 9a405010c5a656f89866906d29866ba98493e91b (diff) | |
parent | c378c56c138945b78d69b8c42218bef74b85de2b (diff) | |
download | openshift-4e6df8801fcb627804b1f4075d25da6d38b49639.tar.gz openshift-4e6df8801fcb627804b1f4075d25da6d38b49639.tar.bz2 openshift-4e6df8801fcb627804b1f4075d25da6d38b49639.tar.xz openshift-4e6df8801fcb627804b1f4075d25da6d38b49639.zip |
Merge pull request #6231 from mtnbikenc/include-deprecation-openshift-master
Include Deprecation - openshift-master
Diffstat (limited to 'roles/openshift_master/tasks/upgrade.yml')
-rw-r--r-- | roles/openshift_master/tasks/upgrade.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/roles/openshift_master/tasks/upgrade.yml b/roles/openshift_master/tasks/upgrade.yml index 92371921d..f84cf2f6e 100644 --- a/roles/openshift_master/tasks/upgrade.yml +++ b/roles/openshift_master/tasks/upgrade.yml @@ -1,16 +1,16 @@ --- -- include: upgrade/rpm_upgrade.yml +- include_tasks: upgrade/rpm_upgrade.yml when: not openshift.common.is_containerized | bool -- include: upgrade/upgrade_scheduler.yml +- include_tasks: upgrade/upgrade_scheduler.yml # master_config_hook is passed in from upgrade play. -- include: "upgrade/{{ master_config_hook }}" +- include_tasks: "upgrade/{{ master_config_hook }}" when: master_config_hook is defined -- include: journald.yml +- include_tasks: journald.yml -- include: systemd_units.yml +- include_tasks: systemd_units.yml - name: Check for ca-bundle.crt stat: |