From 464b404f487a8307713592dc28d85f96c9c5fced Mon Sep 17 00:00:00 2001
From: Greg Szabo <greg@philosobear.com>
Date: Sat, 29 Jul 2017 09:08:29 +0000
Subject: [PATCH] fixes

---
 ansible/install.yml                                   |  1 +
 ansible/roles/config/tasks/main.yml                   | 11 +++--------
 ansible/roles/config/templates/genesis-server.json.j2 |  4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ansible/install.yml b/ansible/install.yml
index a4581fdd7..c2cb23e9e 100644
--- a/ansible/install.yml
+++ b/ansible/install.yml
@@ -3,6 +3,7 @@
 #variable "service" is required
 
 - hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') }}"
+  any_errors_fatal: true
   roles:
     - install
     - {role: generic-service, when: service == 'tendermint'}
diff --git a/ansible/roles/config/tasks/main.yml b/ansible/roles/config/tasks/main.yml
index b8e3d94b8..8323a7a48 100644
--- a/ansible/roles/config/tasks/main.yml
+++ b/ansible/roles/config/tasks/main.yml
@@ -2,23 +2,18 @@
 
 - name: gather tendermint public keys
   when: (validators == true or validators == 'true') and tendermint_genesis_file is not defined
-  command: "sudo -Hu {{service}} tendermint show_validator --home /etc/{{service}}/tendermint --log_level error"
-#  become: yes
-#  become_user: "{{service}}"
+  command: "/usr/bin/tendermint show_validator --home /etc/{{service}}/tendermint --log_level error"
   register: pubkeys
   changed_when: false
 
-- debug: var=((groups[testnet_name]|default([]))+(groups['tag_Environment_'~testnet_name]|default([])))
-- debug: var=pubkeys
+- name: resetting permissions from root after gathering public keys
+  file: "path=/etc/{{service}}/tendermint owner={{service}} group={{service}} recurse=yes"
 
 - name: register tendermint public keys as host facts
   when: (validators == true or validators == 'true') and tendermint_genesis_file is not defined
   set_fact: "pubkey='{{pubkeys.stdout}}'"
   connection: local
 
-- debug: var=hostvars[inventory_hostname]["pubkey"]
-- debug: var=hostvars[inventory_hostname]["pubkey"]["data"]
-
 - name: copy generated tendermint genesis.json - genesis_time will be updated
   when: (validators == true or validators == 'true') and tendermint_genesis_file is not defined
   template:
diff --git a/ansible/roles/config/templates/genesis-server.json.j2 b/ansible/roles/config/templates/genesis-server.json.j2
index b80bf79e8..5c693eeba 100644
--- a/ansible/roles/config/templates/genesis-server.json.j2
+++ b/ansible/roles/config/templates/genesis-server.json.j2
@@ -3,7 +3,7 @@
   "chain_id":"{{testnet_name}}",
   "validators":
   [
-{% if (validators == true or validators == 'true') %}
+{% if (validators == true) or (validators == 'true') %}
 {% set comma = joiner(",") %}
 {% for host in (groups[testnet_name]|default([]))+(groups['tag_Environment_'~testnet_name]|default([])) %}
     {{ comma() }}
@@ -13,7 +13,7 @@
         "type": "{{hostvars[host]["pubkey"]["type"]}}"
       },
       "amount":10,
-      "name":"{{hostvars[host]["ansible_hostname"]}}"
+      "name":"{{hostvars[host]["inventory_hostname"]}}"
     }
 {% endfor %}
 {% endif %}