Merge remote-tracking branch 'upstream/master' into stacklight

galera/meta/salt.yml

+orchestrate:
+  master:
+    priority: 140
+  slave:
+    priority: 150
+

galera/orchestrate/init.sls

-galera_master:
-  salt.state:
-    - tgt: 'roles:galera.master'
-    - tgt_type: grain
-    - sls: galera
-
-galera_slaves:
-  salt.state:
-    - tgt: 'roles:galera.slave'
-    - tgt_type: grain
-    - sls: galera
-    - require:
-      - salt: galera_master
-

galera/orchestrate/master.sls

+galera.master:
+  salt.state:
+    - tgt: 'galera:master'
+    - tgt_type: pillar
+    - queue: True
+    - sls: galera.master
+    - batch: 1
+
+galera.server:
+  salt.state:
+    - tgt: 'galera:master'
+    - tgt_type: pillar
+    - queue: True
+    - sls: galera.server
+    - batch: 1
+    - require:
+      - salt: galera.master
+

galera/orchestrate/slave.sls

+galera.slave:
+  salt.state:
+    - tgt: 'galera:slave'
+    - tgt_type: pillar
+    - queue: True
+    - sls: galera.slave
+    - batch: 1
+    - require:
+      - salt: galera.server
+