summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-08 15:25:30 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-12 14:12:42 -0400
commit463737fd43a841b829d5c7824daf0d996e264a85 (patch)
tree36d6b6e239f463a1bdd03ea368c49fe037802115
parentf443be046bdd69db223f8ba5ec6c13636f66c52f (diff)
downloadopenshift-463737fd43a841b829d5c7824daf0d996e264a85.tar.gz
openshift-463737fd43a841b829d5c7824daf0d996e264a85.tar.bz2
openshift-463737fd43a841b829d5c7824daf0d996e264a85.tar.xz
openshift-463737fd43a841b829d5c7824daf0d996e264a85.zip
Installs and upgrades from authenticated registries are not supported for now
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml31
1 files changed, 0 insertions, 31 deletions
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 212cdab66..957a22ce9 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
@@ -11,37 +11,6 @@
- include: docker_upgrade.yml
when: not openshift.common.is_atomic | bool
-# This is a workaround for authenticated registries
-# This has to happen after the docker upgrade due to a bug in docker 1.8.2's
-# --add-registry implementation
-- name: Download new images
- hosts: oo_nodes_to_config
- roles:
- - openshift_facts
- tasks:
- - name: Pull Images
- command: >
- docker pull {{ item }}:v{{ g_new_version }}
- with_items:
- - "{{ openshift.node.node_image }}"
- - "{{ openshift.node.ovs_image }}"
- - "{{ openshift.common.pod_image }}"
- - "{{ openshift.common.router_image }}"
- - "{{ openshift.common.registry_image }}"
- - "{{ openshift.common.deployer_image }}"
-
-# This is a workaround for authenticated registries
-- name: Download new images
- hosts: oo_masters_to_config
- roles:
- - openshift_facts
- tasks:
- - name: Pull Images
- command: >
- docker pull {{ item }}:v{{ g_new_version }}
- with_items:
- - "{{ openshift.master.master_image }}"
-
###############################################################################
# Upgrade Masters
###############################################################################