diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-09-12 15:50:32 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-09-29 10:25:58 -0300 |
| commit | 9dcc8fc7123e1f13e945a658ffe7331730b0105f (patch) | |
| tree | 3bd75059ff30727706a82c43ac6378a34a03e114 /playbooks/common/openshift-cluster/upgrades/pre | |
| parent | 6f056fd9673428c00b5e496a9a084cf09ad777cf (diff) | |
| download | openshift-9dcc8fc7123e1f13e945a658ffe7331730b0105f.tar.gz openshift-9dcc8fc7123e1f13e945a658ffe7331730b0105f.tar.bz2 openshift-9dcc8fc7123e1f13e945a658ffe7331730b0105f.tar.xz openshift-9dcc8fc7123e1f13e945a658ffe7331730b0105f.zip | |
Split upgrade for control plane/nodes.
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/pre')
3 files changed, 2 insertions, 7 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/backup_etcd.yml b/playbooks/common/openshift-cluster/upgrades/pre/backup_etcd.yml index 994ac2bb9..3164b43ee 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/backup_etcd.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/backup_etcd.yml @@ -85,9 +85,3 @@ msg: "Upgrade cannot continue. The following hosts did not complete etcd backup: {{ etcd_backup_failed | join(',') }}" when: etcd_backup_failed | length > 0 -- name: Exit upgrade if dry-run specified - hosts: oo_first_master - tasks: - - fail: - msg: "Pre-upgrade checks completed, exiting due to openshift_upgrade_dry_run variable." - when: openshift_upgrade_dry_run is defined and openshift_upgrade_dry_run | bool diff --git a/playbooks/common/openshift-cluster/upgrades/pre/roles b/playbooks/common/openshift-cluster/upgrades/pre/roles new file mode 120000 index 000000000..415645be6 --- /dev/null +++ b/playbooks/common/openshift-cluster/upgrades/pre/roles @@ -0,0 +1 @@ +../../../../../roles/
\ No newline at end of file diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_docker_upgrade_targets.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_docker_upgrade_targets.yml index 635172de9..d8b282b41 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/verify_docker_upgrade_targets.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_docker_upgrade_targets.yml @@ -4,7 +4,7 @@ tasks: # Only check if docker upgrade is required if docker_upgrade is not # already set to False. - - include: docker/upgrade_check.yml + - include: ../docker/upgrade_check.yml when: docker_upgrade is not defined or docker_upgrade | bool and not openshift.common.is_atomic | bool # Additional checks for Atomic hosts: |