Merge pull request #22 from dafyddj/fix_systemd

Fix systemd unit file, file backend, generating self-signed cert, upgrade process

.kitchen.yml

@@ -3,63 +3,68 @@ driver:
   name: docker
   use_sudo: false
   privileged: true
+  run_command: /sbin/init
+  provision_command:
+    - curl -L https://bootstrap.saltstack.com | sh -s -- -X     # install Salt and dependencies here to make use of Docker build cache, speeding up tests massively
 
 verifier:
   name: inspec
 
 provisioner:
   name: salt_solo
   salt_version: latest
-  log_level: debug
+  log_level: info
   require_chef: false
   formula: vault
 
 platforms:
   - name: ubuntu-16.04
-    driver_config:
+    driver:
+      name: docker
       provision_command:
-        - apt-get update && apt-get install -y locales && locale-gen en_US.UTF-8
-      run_command: /sbin/init
-      pid_one_command: /usr/lib/systemd/systemd
+        - apt-get install -y locales net-tools && locale-gen en_US.UTF-8
+        - curl -L https://bootstrap.saltstack.com | sh -s -- -X
   - name: centos-7
-    driver_config:
-      run_command: /sbin/init
-      pid_one_command: /usr/lib/systemd/systemd
-  - name: amazonlinux
-    driver_config:
+    driver:
+      name: docker
       provision_command:
-        - yum install -y epel-release
+        - yum -y install net-tools    # needed by inspec
+        - curl -L https://bootstrap.saltstack.com | sh -s -- -X
+  - name: amazonlinux
+    driver:
+      name: docker
       image: amazonlinux:1
       platform: rhel
-      run_command: /sbin/init
 
 suites:
-  - name: dev_server_systemd
-    excludes:
-      - amazonlinux
+  - name: install_binary
     provisioner:
       state_top:
         base:
           '*':
             - vault
-            - vault.server
       pillars:
         top.sls:
           base:
             '*':
               - vault
         vault.sls:
           vault:
-            service:
-              type: systemd
-  - name: dev_server_upstart_s3
-    includes:
-      - amazonlinux
+#            version: 0.11.1    # test upgrades by doing a double-converge, changing the version pillar between each one
+            version: 0.11.2
+            secure_download: false
+
+  - name: dev_server
+    provisioner:
+      state_top:
+        base:
+          '*':
+            - vault.server
+  - name: prod_server
     provisioner:
       state_top:
         base:
           '*':
-            - vault
             - vault.server
       pillars:
         top.sls:
@@ -68,8 +73,14 @@ suites:
               - vault
         vault.sls:
           vault:
-            service:
-              type: upstart
-            backend:
-              type: s3
-              bucket: com-saltstack-vault
+            dev_mode: false
+            tls_disable: 1
+            self_signed_cert:
+              enabled: true
+              hostname: localhost
+              password: localhost
+              country: GB
+              state: England
+              city: London
+              org: example.com
+              org_unit: testing

.travis.yml

@@ -1,11 +1,17 @@
 sudo: required
-
 language: ruby
+cache: bundler
 
 services:
   - docker
 
+
 before_install:
-  - bundle install
+  - gem install bundler --no-document
+
+env:
+  - PLATFORM=ubuntu
+  - PLATFORM=centos
+  - PLATFORM=amazon
 
-script: bundle exec kitchen verify
+script: bundle exec kitchen test ${PLATFORM}