commit 076e11e010d2e3d8344c2ab9e0261cf8985cd3d5
author Zack Williams <zdw@cs.arizona.edu> Mon Jun 27 09:32:41 2016 -0700
committer Gerrit Code Review <gerrit@localhost> Mon Jun 27 09:32:41 2016 -0700
tree 5bb2741fac282ab5df4fc8d230efa69f35766dbf
parent efe93629334924fe781d2feb8df53c3aa6c11ea0
parent 6e786a379d48441c240eb203b9738d3d2de82ac0

Merge "Django 1.8 fails with an ImproperlyConfigured exception when `fields` or `exclude` isn't set:"

xos/synchronizer/steps/sync_host.yaml

diff --git a/xos/synchronizer/steps/sync_host.yaml b/xos/synchronizer/steps/sync_host.yaml
index 58bccba..8bc442f 100644
--- a/xos/synchronizer/steps/sync_host.yaml
+++ b/xos/synchronizer/steps/sync_host.yaml
@@ -1,20 +1,7 @@
 ---
 - hosts: 127.0.0.1
   connection: local
-  vars:
-    rest_hostname: {{ rest_hostname }}
-    rest_port: {{ rest_port }}
-    rest_endpoint: {{ rest_endpoint }}
-    rest_json: '{{ rest_json }}'
 
   tasks:
-  - debug: var=rest_json
-
-  - name: Call Fabric REST API
-    uri:
-      url: http://{{ '{{' }} rest_hostname {{ '}}' }}:{{ '{{' }} rest_port {{ '}}' }}/{{ '{{' }} rest_endpoint {{ '}}' }} #http://localhost:8181/onos/v1/network/configuration/
-      body: "{{ '{{' }} rest_json {{ '}}' }}"
-      body_format: raw
-      method: POST
-      user: karaf
-      password: karaf
+  - name: Add host entry for fabric
+    command: curl -sS --user onos:rocks -X POST -HContent-Type:application/json -d '{{ rest_json }}' http://{{ rest_hostname }}:{{ rest_port }}/{{ rest_endpoint }}

xos/synchronizer/steps/sync_vroutertenant.py

diff --git a/xos/synchronizer/steps/sync_vroutertenant.py b/xos/synchronizer/steps/sync_vroutertenant.py
index fd77ca2..6a0cb86 100644
--- a/xos/synchronizer/steps/sync_vroutertenant.py
+++ b/xos/synchronizer/steps/sync_vroutertenant.py
@@ -88,7 +88,7 @@
             }
         }
 
-        rest_json = json.dumps(data, indent=4)
+        rest_json = json.dumps(data)
 
         fields = {
             'rest_hostname': fos.rest_hostname,