summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-09 09:53:00 -0500
committerGitHub <noreply@github.com>2017-01-09 09:53:00 -0500
commit96fe76dad188610733c87cf80f4e22da34f11fb7 (patch)
treee4cfa9c97516cc254f7bcd11b4868914f4f27fe2
parent1d5c152e7fd53d1aceefc13d7196c020d39f0e94 (diff)
parent1510e35fc9acdc3b477a27a174ec380cde4d6f40 (diff)
downloadopenshift-96fe76dad188610733c87cf80f4e22da34f11fb7.tar.gz
openshift-96fe76dad188610733c87cf80f4e22da34f11fb7.tar.bz2
openshift-96fe76dad188610733c87cf80f4e22da34f11fb7.tar.xz
openshift-96fe76dad188610733c87cf80f4e22da34f11fb7.zip
Merge pull request #3058 from openshift/etcd-image
etcd 3.x image is 'etcd' not 'etcd3'
-rw-r--r--playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml b/playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml
index f88981a0b..5f8b59e17 100644
--- a/playbooks/common/openshift-cluster/upgrades/etcd/containerized_tasks.yml
+++ b/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 }}"