From 8e0ed4ddd069c8bf6361371931fd074e0479a29e Mon Sep 17 00:00:00 2001
From: Greg Szabo <greg@philosobear.com>
Date: Thu, 26 Oct 2017 19:44:58 -0400
Subject: [PATCH] genesis deployment fixes

---
 ansible/roles/config/tasks/main.yml |  5 +++--
 ansible/roles/status/tasks/main.yml | 12 +++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/config/tasks/main.yml b/ansible/roles/config/tasks/main.yml
index 8fa90583f..5130a4a1f 100644
--- a/ansible/roles/config/tasks/main.yml
+++ b/ansible/roles/config/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: gather tendermint public keys
-  when: (validators == true or validators == 'true') and tendermint_genesis_file is not defined
+  when: (validators == true or validators == 'true') and genesis_file is not defined
   tags: reconfig-toml,reconfig-genesis
   command: "/usr/bin/tendermint show_validator --home /etc/{{service}} --log_level error"
   register: pubkeys
@@ -12,7 +12,7 @@
   file: "path=/etc/{{service}} 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
+  when: (validators == true or validators == 'true') and genesis_file is not defined
   tags: reconfig-toml,reconfig-genesis
   set_fact: "pubkey='{{pubkeys.stdout}}'"
   connection: local
@@ -28,6 +28,7 @@
 
 - name: copy pre-created genesis.json
   when: genesis_file is defined
+  tags: reconfig-genesis
   copy: "src={{genesis_file}} dest=/etc/{{service}}/genesis.json owner={{service}} group={{service}}"
 
 - name: copy tendermint config.toml
diff --git a/ansible/roles/status/tasks/main.yml b/ansible/roles/status/tasks/main.yml
index e47d634e7..d063ee564 100644
--- a/ansible/roles/status/tasks/main.yml
+++ b/ansible/roles/status/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: start service
+- name: application service status
   command: "service {{service}} status"
   changed_when: false
   register: status
@@ -8,3 +8,13 @@
 - name: Result
   debug: var=status.stdout_lines
 
+- name: tendermint service status
+  when: service != 'tendermint'
+  command: "service {{service}}-server status"
+  changed_when: false
+  register: tendermintstatus
+
+- name: Result
+  when: service != 'tendermint'
+  debug: var=tendermintstatus.stdout_lines
+