Update kitchen dokken configuration.

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

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
@@ -41,35 +41,43 @@ 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:
           provider: systemd
   - name: ubuntu-14.04
     named_run_list: debian
     driver:
-      image: ubuntu:14.04
+      image: ubuntu-upstart:14.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: ubuntu-12.04
     named_run_list: debian
     driver:
-      image: ubuntu:12.04
+      image: ubuntu-upstart: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,18 +78,6 @@
   it { should be_mode 750 }
 end
 
-if os[:family] == 'ubuntu'
-  describe file('/etc/init/consul.conf' ) do
-    its(:content) do
-      should include(<<-EOT)
-post-start script
-  while ! #{consul_executable} info ; sleep 1; done
-end script
-      EOT
-    end
-  end
-end
-
 describe file("#{confd_dir}/consul_definition_check.json") do
   it { should be_file }
   it { should be_owned_by     'root' }