From 0653a2288c3e5ece93b349199fc7ac513d00c561 Mon Sep 17 00:00:00 2001 From: Eric Renfro Date: Wed, 16 May 2018 11:18:36 -0400 Subject: [PATCH] Re-added ubuntu-14.04 back, changed defaults to remove encrypt --- .kitchen.yml | 6 ++++++ consul/defaults.yaml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.kitchen.yml b/.kitchen.yml index e46974b..6dae872 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -11,6 +11,12 @@ verifier: - test/integration/consul/inspec platforms: + - name: ubuntu-14.04 + driver_config: + disable_upstart: false + image: ubuntu-upstart:14.04 + run_command: /sbin/init + - name: debian-9.4 driver_config: run_command: /bin/systemd diff --git a/consul/defaults.yaml b/consul/defaults.yaml index 5a56461..98ea0a1 100644 --- a/consul/defaults.yaml +++ b/consul/defaults.yaml @@ -14,7 +14,6 @@ consul: ui: true enable_debug: false log_level: info - encrypt: "" retry_join: [] retry_interval: 30s datacenter: "main"