give pillar vars more modularity

.kitchen.yml

@@ -25,30 +25,28 @@ provisioner:
   #log_level: quiet
   require_chef: false
   formula: consul
+  state_top:
+    base:
+      '*':
+        - consul
+  pillars-from-files:
+    base.sls: pillar.example
+  pillars:
+    top.sls:
+      base:
+        '*':
+          - base
+          - consul
+    consul.sls:
+      consul:
+        register: []
+        scripts: []
 
 suites:
-  - name: consul
+  - name: consul-server
     provisioner:
-      state_top:
-        base:
-          '*':
-            - consul
       pillars:
         consul.sls:
           consul:
-            service: True
             config:
               server: True
-              bind_addr: 0.0.0.0
-              enable_debug: True
-              datacenter: eu
-              encrypt: "RIxqpNlOXqtr/j4BgvIMEw=="
-              bootstrap_expect: 3
-              retry_interval: 15s
-              retry_join:
-                - 1.1.1.1
-                - 2.2.2.2
-        top.sls:
-          base:
-            '*':
-              - consul

.travis.yml

@@ -8,9 +8,9 @@ before_install:
 
 env:
   matrix:
-    - INSTANCE: consul-ubuntu-1404
+    - INSTANCE: consul-server-ubuntu-1404
-    - INSTANCE: consul-ubuntu-1604
+    - INSTANCE: consul-server-ubuntu-1604
-    - INSTANCE: consul-centos-7
+    - INSTANCE: consul-server-centos-7
 
 script:
   - bundle exec kitchen verify ${INSTANCE}