From 92869b5b35d48ad220d9d3e313be091ced851d6c Mon Sep 17 00:00:00 2001
From: Greg Szabo <greg@philosobear.com>
Date: Tue, 12 Sep 2017 15:56:09 -0400
Subject: [PATCH] Added devops_path to Ansible playbooks

---
 ansible/roles/install/defaults/main.yml | 1 +
 ansible/roles/install/tasks/centos.yml  | 6 +++---
 ansible/roles/install/tasks/debian.yml  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/install/defaults/main.yml b/ansible/roles/install/defaults/main.yml
index 10dad07d4..f9e5a31d7 100644
--- a/ansible/roles/install/defaults/main.yml
+++ b/ansible/roles/install/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
 release_install: true
 binary: "{{ lookup('env','GOPATH') | default('') }}/bin/{{service}}"
+devops_path: false
 
diff --git a/ansible/roles/install/tasks/centos.yml b/ansible/roles/install/tasks/centos.yml
index b6396d7d4..566c9cebf 100644
--- a/ansible/roles/install/tasks/centos.yml
+++ b/ansible/roles/install/tasks/centos.yml
@@ -13,7 +13,7 @@
 #Workaround
 - name: Download repository key for CentOS/RedHat
   when: ansible_os_family == "RedHat"
-  get_url: "url=https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint dest=/root/RPM-GPG-KEY-Tendermint force=yes checksum=sha256:a8c61d4061697d2595562c703dbafbdfdcfa7f0c75a523ac84d5609d1b444abe"
+  get_url: "url=https://tendermint-packages.interblock.io/{{ (devops_path | default(false) | bool) | ternary('devops/','') }}centos/7/os/x86_64/RPM-GPG-KEY-Tendermint dest=/root/RPM-GPG-KEY-Tendermint force=yes checksum=sha256:a8c61d4061697d2595562c703dbafbdfdcfa7f0c75a523ac84d5609d1b444abe"
 - name: Import repository key for CentOS/RedHat
   when: ansible_os_family == "RedHat"
   command: "rpm --import /root/RPM-GPG-KEY-Tendermint"
@@ -22,10 +22,10 @@
   when: ansible_os_family == "RedHat"
   yum_repository:
     name: tendermint
-    baseurl: https://tendermint-packages.interblock.io/centos/7/os/x86_64
+    baseurl: https://tendermint-packages.interblock.io/{{ (devops_path | default(false) | bool) | ternary('devops/','') }}centos/7/os/x86_64
     description: "Tendermint repo"
     gpgcheck: yes
-    gpgkey: https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
+    gpgkey: https://tendermint-packages.interblock.io/{{ (devops_path | default(false) | bool) | ternary('devops/','') }}centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
 #    repo_gpgcheck: yes
 
 - name: Install package on CentOS/RedHat
diff --git a/ansible/roles/install/tasks/debian.yml b/ansible/roles/install/tasks/debian.yml
index 8b955659f..d003d14aa 100644
--- a/ansible/roles/install/tasks/debian.yml
+++ b/ansible/roles/install/tasks/debian.yml
@@ -8,13 +8,13 @@
 - name: Add repository key on Debian/Ubuntu
   when: ansible_os_family == "Debian"
   apt_key:
-    url: https://tendermint-packages.interblock.io/centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
+    url: https://tendermint-packages.interblock.io/{{ (devops_path | default(false) | bool) | ternary('devops/','') }}centos/7/os/x86_64/RPM-GPG-KEY-Tendermint
     id: 2122CBE9
 
 - name: Install tendermint repository on Debian/Ubuntu
   when: ansible_os_family == "Debian"
   apt_repository:
-    repo: deb https://tendermint-packages.interblock.io/debian stable main
+    repo: deb https://tendermint-packages.interblock.io/{{ (devops_path | default(false) | bool) | ternary('devops/','') }}debian stable main
 
 - name: Install package on Debian/Ubuntu
   when: ansible_os_family == "Debian"