summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-21 11:14:43 -0500
committerGitHub <noreply@github.com>2017-11-21 11:14:43 -0500
commitd3db256551db1b073bb543e3e3a541bc52b23f32 (patch)
treec1ca1b599fced2feb99da3ff407acaa4987e18fd /roles/etcd/tasks
parent2a9e225c9f2f1d1f886c9ff6af0443dcd5fdae17 (diff)
parent85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e (diff)
downloadopenshift-d3db256551db1b073bb543e3e3a541bc52b23f32.tar.gz
openshift-d3db256551db1b073bb543e3e3a541bc52b23f32.tar.bz2
openshift-d3db256551db1b073bb543e3e3a541bc52b23f32.tar.xz
openshift-d3db256551db1b073bb543e3e3a541bc52b23f32.zip
Merge pull request #6197 from mgugino-upstream-stage/etcd-image
Refactor etcd image
Diffstat (limited to 'roles/etcd/tasks')
-rw-r--r--roles/etcd/tasks/main.yml2
-rw-r--r--roles/etcd/tasks/system_container.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index 3e69af314..fabe66b91 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -20,7 +20,7 @@
- block:
- name: Pull etcd container
- command: docker pull {{ openshift.etcd.etcd_image }}
+ command: docker pull {{ etcd_image }}
register: pull_result
changed_when: "'Downloaded newer image' in pull_result.stdout"
diff --git a/roles/etcd/tasks/system_container.yml b/roles/etcd/tasks/system_container.yml
index f71d9b551..82ac4fc84 100644
--- a/roles/etcd/tasks/system_container.yml
+++ b/roles/etcd/tasks/system_container.yml
@@ -5,7 +5,7 @@
tasks_from: proxy
- name: Pull etcd system container
- command: atomic pull --storage=ostree {{ openshift.etcd.etcd_image }}
+ command: atomic pull --storage=ostree {{ etcd_image }}
register: pull_result
changed_when: "'Pulling layer' in pull_result.stdout"
@@ -57,7 +57,7 @@
- name: Install or Update Etcd system container package
oc_atomic_container:
name: etcd
- image: "{{ openshift.etcd.etcd_image }}"
+ image: "{{ etcd_image }}"
state: latest
values:
- ETCD_DATA_DIR=/var/lib/etcd