Merge branch 'dev' into foxtrot

salt/elasticsearch/files/elasticsearch.yml

@@ -49,6 +49,16 @@ discovery.seed_hosts:
    - {{ SN.split('_')|first }}
       {%- endfor %}
     {%- endif %}
+  {%- elif grains.role == 'so-managersearch' %}
+      {%- if salt['pillar.get']('nodestab', {}) %}
+node.roles: [ master, data, remote_cluster_client ]
+discovery.seed_hosts:
+   - {{ grains.master }}
+      {%- for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
+   - {{ SN.split('_')|first }}
+      {%- endfor %}
+    {%- endif %}
+node.attr.box_type: {{ NODE_ROUTE_TYPE }}
   {%- else %}
 node.roles: {{ NODE_ROLES }}
 node.attr.box_type: {{ NODE_ROUTE_TYPE }}

salt/patch/os/schedule.sls

@@ -42,7 +42,7 @@ patch_os_schedule:
     - function: state.sls
     - job_args:
       - patch.os
-    - hours: 8 
+    - hours: {{ patch_os_pillar.get('hours', 8) }} 
     - splay: {{splay}}
     - return_job: True