From 426938e2b498e24884c252140fb607b607d97418 Mon Sep 17 00:00:00 2001
From: Greg Szabo <greg@philosobear.com>
Date: Sat, 3 Mar 2018 05:06:03 -0500
Subject: [PATCH] persistent_peers changes

---
 ansible/roles/config/defaults/main.yml        | 1 +
 ansible/roles/config/templates/config.toml.j2 | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/config/defaults/main.yml b/ansible/roles/config/defaults/main.yml
index 4b9281a5e..79b01ab13 100644
--- a/ansible/roles/config/defaults/main.yml
+++ b/ansible/roles/config/defaults/main.yml
@@ -2,6 +2,7 @@
 #genesis_file: "<undefined>"
 app_options_file: "app_options_files/public_testnet"
 seeds: ""
+persistent_peers: ""
 testnet_name: testnet1
 validators: true
 
diff --git a/ansible/roles/config/templates/config.toml.j2 b/ansible/roles/config/templates/config.toml.j2
index 9639697e7..1965975a9 100644
--- a/ansible/roles/config/templates/config.toml.j2
+++ b/ansible/roles/config/templates/config.toml.j2
@@ -83,14 +83,12 @@ unsafe = false
 laddr = "tcp://0.0.0.0:46656"
 
 # Comma separated list of seed nodes to connect to
-{% if validators == true or validators == 'true' %}
-{% set comma = joiner(",") %}seeds = "{% for host in ((groups[testnet_name]|default([]))+(groups['tag_Environment_'~(testnet_name|regex_replace('-','_'))]|default([])))|difference(inventory_hostname) %}{{ comma() }}{{hostvars[host]["nodeid"]}}@{{hostvars[host]["inventory_hostname"]}}:46656{% endfor %}"
-{% else %}
 seeds = "{{ seeds | default() }}"
-{% endif %}
 
 # Comma separated list of nodes to keep persistent connections to
-persistent_peers = ""
+{% set comma = joiner(",") %}persistent_peers = "{% for host in ((groups[testnet_name]|default([]))+(groups['tag_Environment_'~(testnet_name|regex_replace('-','_'))]|default([])))|difference(inventory_hostname) %}{{ comma() }}{{hostvars[host]["nodeid"]}}@{{hostvars[host]["inventory_hostname"]}}:46656{% endfor %}"
+{% else %}
+persistent_peers = "{{ persistent_peers | default() }}"
 
 # Path to address book
 addr_book_file = "config/addrbook.json"