Browse Source

Merge pull request #3058 from openshift/etcd-image

etcd 3.x image is 'etcd' not 'etcd3'
Scott Dodson 8 years ago
parent
commit
96fe76dad1

+ 1 - 2
playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml

@@ -8,8 +8,7 @@
 
 - name: Set new_etcd_image
   set_fact:
-    new_etcd_image: "{{ current_image.stdout | regex_replace('/etcd.*$','/etcd3:' ~ upgrade_version ) if upgrade_version | version_compare('3.0','>=')
-                        else current_image.stdout.split(':')[0] ~ ':' ~ upgrade_version }}"
+    new_etcd_image: "{{ current_image.stdout | regex_replace('/etcd.*$','/etcd:' ~ upgrade_version ) }}"
 
 - name: Pull new etcd image
   command: "docker pull {{ new_etcd_image }}"