From 670db4e1104106488d1bbf4bbfa59910e1e731ad Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <s@cassiba.com>
Date: Fri, 20 Apr 2018 08:13:15 -0700
Subject: [PATCH] Support Chef 14 in Test Kitchen scenarios

- Chef 14 support has stablized, so we want to start using it.
- Docker support needed some tweaks for the AIO scenario to converge
  with Chef 14.

Change-Id: I8aac7a2e5d07caa66a2926873f2fbd7c2ace9650
---
 .kitchen.dokken.yml | 29 +++++++++++++++++++++--------
 .kitchen.multi.yml  |  2 +-
 .kitchen.yml        |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
index 264c796..e2eb649 100644
--- a/.kitchen.dokken.yml
+++ b/.kitchen.dokken.yml
@@ -2,10 +2,11 @@
 driver:
   name: dokken
   privileged: true
-  chef_version: 13
+  chef_version: 14
   volumes:
-    - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    - /sys/fs/selinux:/sys/fs/selinux:rw
+    - /sys/fs/cgroup:/sys/fs/cgroup
+    - /lib/modules:/lib/modules:ro
+    - /run/openvswitch:/run/openvswitch
 
 transport:
   name: dokken
@@ -22,19 +23,31 @@ platforms:
     driver:
       image: dokken/ubuntu-16.04
       pid_one_command: /bin/systemd
-      intermediate_instructions:
-        - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install apt-transport-https lsb-release procps net-tools sudo -y
   - name: centos-7
     platform: rhel
     driver:
       image: dokken/centos-7
       pid_one_command: /usr/lib/systemd/systemd
-      intermediate_instructions:
-        - RUN yum -y install which net-tools
 
 suites:
   - name: default
+    driver:
+      ports:
+        - '80'
+        - '8080'
+        - '443'
+        - '3460'
+        - '3306'
+        - '5672'
+        - '5000'
+        - '35357'
+        - '8774'
+        - '8776'
+        - '9292'
+        - '9696'
+        - '8000'
+        - '8003'
+        - '8004'
     run_list:
       # run_list taken from roles/allinone.json
       - recipe[selinux::disabled]
diff --git a/.kitchen.multi.yml b/.kitchen.multi.yml
index 636f304..6695706 100644
--- a/.kitchen.multi.yml
+++ b/.kitchen.multi.yml
@@ -14,7 +14,7 @@ provisioner:
   #   always_update_cookbooks: <%= !ENV['CI'] %>
   always_update_cookbooks: true
   product_name: chef
-  product_version: 13
+  product_version: 14
   # Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
   # before any recipes had a chance to run -> we cannot use a recipe to put the
   # secrets file in place.
diff --git a/.kitchen.yml b/.kitchen.yml
index ed8c61f..f359be5 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -20,7 +20,7 @@ provisioner:
   #   always_update_cookbooks: <%= !ENV['CI'] %>
   always_update_cookbooks: true
   product_name: chef
-  product_version: 13
+  product_version: 14
   # Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
   # before any recipes had a chance to run -> we cannot use a recipe to put the
   # secrets file in place.