diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-13 15:32:10 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-13 15:32:10 -0300 |
| commit | 04643670db5709358fe55916705a9ce15ff0bb1e (patch) | |
| tree | de4a4e82cba6effbec01fedfc8e296c3b5483fd3 | |
| parent | b1cabe9584c17fb38f4243054c4a40a5e5522b65 (diff) | |
| download | openshift-04643670db5709358fe55916705a9ce15ff0bb1e.tar.gz openshift-04643670db5709358fe55916705a9ce15ff0bb1e.tar.bz2 openshift-04643670db5709358fe55916705a9ce15ff0bb1e.tar.xz openshift-04643670db5709358fe55916705a9ce15ff0bb1e.zip | |
Remove the use of the upgrading variable.
3 files changed, 0 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml index 9cba1b40b..d0960da76 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml @@ -71,7 +71,6 @@ # defined, and overriding the normal behavior of protecting the installed version openshift_release: "3.2" openshift_protect_installed_version: False - upgrading: true - name: Verify master processes hosts: oo_masters_to_config diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index c93bf2a17..7b5b9e8d7 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -132,7 +132,6 @@ origin_reconcile_bindings: "{{ deployment_type == 'origin' and g_new_version | version_compare('1.0.6', '>') }}" ent_reconcile_bindings: true openshift_docker_hosted_registry_network: "{{ hostvars[groups.oo_first_master.0].openshift.common.portal_net }}" - upgrading: True tasks: - name: Verifying the correct commandline tools are available shell: grep {{ verify_upgrade_version }} {{ openshift.common.admin_binary}} diff --git a/roles/openshift_docker/defaults/main.yml b/roles/openshift_docker/defaults/main.yml index aebef75d6..ed97d539c 100644 --- a/roles/openshift_docker/defaults/main.yml +++ b/roles/openshift_docker/defaults/main.yml @@ -1,2 +1 @@ --- -upgrading: False |