Update kitchen dokken configuration.

sous-chefs · Aug 7, 2016 · c05271f · c05271f
1 parent e3af4e8
commit c05271f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
@@ -41,7 +41,7 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
-        - RUN /usr/bin/apt-get install sudo -y
+        - RUN /usr/bin/apt-get install sudo net-tools -y
     attributes:
       poise-service:
         consul:
@@ -53,23 +53,31 @@ platforms:
       pid_one_command: /sbin/init
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
-        - RUN /usr/bin/apt-get install sudo -y
+        - RUN /usr/bin/apt-get install sudo net-tools -y
+    attributes:
+      poise-service:
+        consul:
+          provider: upstart
   - name: ubuntu-12.04
     named_run_list: debian
     driver:
       image: ubuntu:12.04
       pid_one_command: /sbin/init
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
-        - RUN /usr/bin/apt-get install sudo -y
+        - RUN /usr/bin/apt-get install sudo net-tools -y
+    attributes:
+      poise-service:
+        consul:
+          provider: upstart
   - name: debian-8
     named_run_list: debian
     driver:
       image: debian:8
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install lsb-release sudo -y
+        - RUN /usr/bin/apt-get install lsb-release sudo net-tools -y
     attributes:
       poise-service:
         consul:
@@ -81,7 +89,11 @@ platforms:
       pid_one_command: /sbin/init
       intermediate_instructions:
         - RUN /usr/bin/apt-get update
-        - RUN /usr/bin/apt-get install lsb-release sudo -y
+        - RUN /usr/bin/apt-get install lsb-release sudo net-tools -y
+    attributes:
+      poise-service:
+        consul:
+          provider: upstart
 suites:
   - name: default
     provisioner:

diff --git a/test/integration/default/serverspec/default_spec.rb b/test/integration/default/serverspec/default_spec.rb
@@ -78,7 +78,7 @@
   it { should be_mode 750 }
 end
 
-if os[:family] == 'ubuntu'
+if os[:family] == 'ubuntu' && os[:release].to_i < 15
   describe file('/etc/init/consul.conf' ) do
     its(:content) do
       should include(<<-EOT)