From 8c2ec1b18c777b4699316a8a60ff9c63845cc4d3 Mon Sep 17 00:00:00 2001
From: Mark McKinstry <mmckinst@umich.edu>
Date: Wed, 8 Mar 2017 10:54:50 -0800
Subject: add ability to specify an etcd version

---
 roles/etcd/tasks/etcdctl.yml                  | 2 +-
 roles/etcd/tasks/main.yml                     | 2 +-
 roles/etcd_server_certificates/tasks/main.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'roles')

diff --git a/roles/etcd/tasks/etcdctl.yml b/roles/etcd/tasks/etcdctl.yml
index bb6fabf64..649ad23c1 100644
--- a/roles/etcd/tasks/etcdctl.yml
+++ b/roles/etcd/tasks/etcdctl.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install etcd for etcdctl
-  package: name=etcd state=present
+  package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present
   when: not openshift.common.is_atomic | bool
 
 - name: Configure etcd profile.d alises
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index b4ffc99e3..c09da3b61 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -7,7 +7,7 @@
     etcd_ip: "{{ etcd_ip }}"
 
 - name: Install etcd
-  package: name=etcd state=present
+  package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present
   when: not etcd_is_containerized | bool
 
 - name: Pull etcd container
diff --git a/roles/etcd_server_certificates/tasks/main.yml b/roles/etcd_server_certificates/tasks/main.yml
index 242c1e997..4ae9b79c4 100644
--- a/roles/etcd_server_certificates/tasks/main.yml
+++ b/roles/etcd_server_certificates/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Install etcd
-  package: name=etcd state=present
+  package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present
   when: not etcd_is_containerized | bool
 
 - name: Check status of etcd certificates
-- 
cgit v1.2.3