From b818d98875f2757ed49bfc94138d3715e76bbb5f Mon Sep 17 00:00:00 2001
From: Greg Szabo <greg@philosobear.com>
Date: Tue, 19 Sep 2017 14:24:27 -0400
Subject: [PATCH] jsonconfig playbook fix

---
 ansible/getfile.yml                            |  1 -
 ansible/roles/jsonconfig/library/jsonconfig.py | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ansible/getfile.yml b/ansible/getfile.yml
index c1c96f66a..9dcee0fa8 100644
--- a/ansible/getfile.yml
+++ b/ansible/getfile.yml
@@ -1,6 +1,5 @@
 ---
 
-#variable "service" is required
 #variable "source" is required
 
 - hosts: "{{ lookup('env','TF_VAR_TESTNET_NAME') }}:tag_Environment_{{ lookup('env','TF_VAR_TESTNET_NAME') | regex_replace('-','_') }}"
diff --git a/ansible/roles/jsonconfig/library/jsonconfig.py b/ansible/roles/jsonconfig/library/jsonconfig.py
index d3b4140e4..11f9146e6 100644
--- a/ansible/roles/jsonconfig/library/jsonconfig.py
+++ b/ansible/roles/jsonconfig/library/jsonconfig.py
@@ -181,7 +181,7 @@ def deepdiff(d1, d2):
         return None
     
 
-def present(module, dest, conf, jsonbool, merge, create, backup):
+def present(module, dest, conf, merge, create, backup):
 
     diff = {'before': '',
             'after': '',
@@ -226,7 +226,7 @@ def present(module, dest, conf, jsonbool, merge, create, backup):
     else:
         mergedconfig = deepmerge(jsonconfig,config)
         if jsonconfig != mergedconfig:
-            b_lines_new = to_bytes(json.dumps(mergedconfig), sort_keys=True, indent=4, separators=(',', ': ')))
+            b_lines_new = to_bytes(json.dumps(mergedconfig, sort_keys=True, indent=4, separators=(',', ': ')))
             msg = 'config merged'
             changed = True
 
@@ -252,7 +252,7 @@ def present(module, dest, conf, jsonbool, merge, create, backup):
     module.exit_json(changed=changed, msg=msg, backup=backupdest, diff=difflist)
 
 
-def absent(module, dest, conf, jsonbool, backup):
+def absent(module, dest, conf, backup):
 
     b_dest = to_bytes(dest, errors='surrogate_or_strict')
     if not os.path.exists(b_dest):
@@ -351,9 +351,9 @@ def main():
     conf = params['json']
 
     if params['state'] == 'present':
-        present(module, dest, conf, jsonbool, merge, create, backup)
+        present(module, dest, conf, merge, create, backup)
     else:
-        absent(module, dest, conf, jsonbool, backup)
+        absent(module, dest, conf, backup)
     
 if __name__ == '__main__':
     main()