Merge pull request #96 from aboe76/rest_tornado

added rest_tornado to _defaults.conf

pillar.example

@@ -20,6 +20,14 @@ salt:
       base:
         - /srv/salt
 
+    # for salt-api with tornado rest interface
+    rest_tornado:
+      port: 8000
+      ssl_crt: /etc/pki/api/certs/server.crt
+      ssl_key: /etc/pki/api/certs/server.key
+      debug: False
+      disable_ssl: False
+ 
   # salt minion config:
   minion:
     master: salt

salt/files/master.d/_defaults.conf

@@ -947,6 +947,15 @@ rest_cherrypy:
   {%- endfor %}
 {%- endif %}
 
+{% if 'rest_tornado' in cfg_master %}
+#####         rest_tornado            #####
+###########################################
+rest_tornado:
+  {% for name, value in cfg_master['rest_tornado'].items() %}
+  {{ name }}: {{ value }}
+  {%- endfor %}
+{%- endif %}
+
 {% if 'presence_events' in cfg_master %}
 #####        presence events         #####
 ##########################################