diff --git a/.fixtures.yml b/.fixtures.yml
index 3ec4f89..38f04dc 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,7 +1,8 @@
+# yamllint disable rule:line-length
 # This file can be used to install module dependencies for unit testing
 # See https://github.com/puppetlabs/puppetlabs_spec_helper#using-fixtures for details
 ---
 fixtures:
   forge_modules:
-      augeas_core: "puppetlabs/augeas_core"
-#     stdlib: "puppetlabs/stdlib"
+    augeas_core: "puppetlabs/augeas_core"
+#   stdlib: "puppetlabs/stdlib"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81e6d76..4319435 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:truthy
 stages:
   - syntax
   - unit
@@ -38,4 +39,3 @@ parallel_spec-Ruby 2.4.5-Puppet ~> 5:
     - bundle exec rake parallel_spec
   variables:
     PUPPET_GEM_VERSION: '~> 5'
-
diff --git a/.rubocop.yml b/.rubocop.yml
index bab25db..117ab19 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:truthy rule:indentation
 require:
 - rubocop-rspec
 - rubocop-i18n
diff --git a/.sync.yml b/.sync.yml
index e69fe00..3cfe349 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length
 .travis.yml:
   addons:
     apt:
diff --git a/.travis.yml b/.travis.yml
index dbc7cd1..51aaaff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:truthy
 dist: xenial
 language: ruby
 cache: bundler
diff --git a/appveyor.yml b/appveyor.yml
index ec38949..a74fc01 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,5 @@
 ---
+# yamllint disable rule:line-length rule:truthy
 version: 1.1.x.{build}
 branches:
   only:
diff --git a/hiera.yaml b/hiera.yaml
index 2251c23..74e5e00 100644
--- a/hiera.yaml
+++ b/hiera.yaml
@@ -9,9 +9,9 @@ hierarchy:
   - name: "osfamily/major release"
     paths:
       - "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
-        # Used for Solaris
+      # Used for Solaris
       - "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
-        # Used to distinguish between Debian and Ubuntu
+      # Used to distinguish between Debian and Ubuntu
       - "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
   - name: "osfamily"
     paths:
diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
index 679afb0..05cf774 100644
--- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-5-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-5-x86_64
-    hypervisor : docker
+    hypervisor: docker
     image: centos:5
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml
index a26f27f..e07adfd 100644
--- a/spec/acceptance/nodesets/centos-5.yml
+++ b/spec/acceptance/nodesets/centos-5.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-5-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-5-x86_64
-    hypervisor : docker
+    hypervisor: docker
     image: tianon/centos:5.10
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
index 9cab03d..1cbeacf 100644
--- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-6-x86_64
-    hypervisor : docker
+    hypervisor: docker
     image: centos:6
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
index e325b9e..39016e9 100644
--- a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-6-x86_64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: centos-6-latest
     user: root
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
index f06036e..82af376 100644
--- a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
@@ -1,11 +1,12 @@
+---
 HOSTS:
   centos-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-6-x86_64
-    hypervisor : vagrant
-    box : camptocamp/centos-6-x86_64
+    hypervisor: vagrant
+    box: camptocamp/centos-6-x86_64
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml
index 71e23cd..5cfd6fc 100644
--- a/spec/acceptance/nodesets/centos-6.yml
+++ b/spec/acceptance/nodesets/centos-6.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-6-x86_64
-    hypervisor : docker
+    hypervisor: docker
     image: centos:6
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
index 0bc9727..329bf9e 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-7-x86_64
-    hypervisor : docker
+    hypervisor: docker
     image: centos:7
     docker_preserve_image: true
     docker_cmd: '["/usr/sbin/init"]'
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
index 9003c86..5f3d7e8 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-7-x86_64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: centos-7-latest
     user: centos
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
index 95402e5..2064466 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -1,11 +1,12 @@
+---
 HOSTS:
   centos-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-7-x86_64
-    hypervisor : vagrant
-    box : camptocamp/centos-7-x86_64
+    hypervisor: vagrant
+    box: camptocamp/centos-7-x86_64
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-7.yml b/spec/acceptance/nodesets/centos-7.yml
index a8fa468..f646634 100644
--- a/spec/acceptance/nodesets/centos-7.yml
+++ b/spec/acceptance/nodesets/centos-7.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   centos-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: el-7-x86_64
-    hypervisor : docker
+    hypervisor: docker
     image: centos:7
     docker_preserve_image: true
     docker_cmd: '["/usr/sbin/init"]'
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
index 359dae7..b15ce0b 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-6-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: debian:6
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
index c6c192f..e14e0dc 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-6-amd64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: debian-6-latest
     user: debian
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
index 03db0fa..c20e216 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
@@ -1,11 +1,12 @@
+---
 HOSTS:
   debian-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-6-amd64
-    hypervisor : vagrant
-    box : puppetlabs/debian-6.0.10-64-nocm
+    hypervisor: vagrant
+    box: puppetlabs/debian-6.0.10-64-nocm
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6.yml b/spec/acceptance/nodesets/debian-6.yml
index d7b0275..9204ee4 100644
--- a/spec/acceptance/nodesets/debian-6.yml
+++ b/spec/acceptance/nodesets/debian-6.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-6-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-6-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: debian/eol:squeeze
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
index fc11f57..63b9cdc 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-7-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: debian:7
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
index 017b4c7..c1ce94f 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-7-amd64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: debian-7-latest
     user: debian
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
index 8ed1264..1097155 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -1,11 +1,12 @@
+---
 HOSTS:
   debian-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-7-amd64
-    hypervisor : vagrant
-    box : camptocamp/debian-7-amd64
+    hypervisor: vagrant
+    box: camptocamp/debian-7-amd64
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7.yml b/spec/acceptance/nodesets/debian-7.yml
index 9591ea7..90cc5cf 100644
--- a/spec/acceptance/nodesets/debian-7.yml
+++ b/spec/acceptance/nodesets/debian-7.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-7-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-7-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: debian:7
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
index 86a55e1..ca322f2 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-8-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-8-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: debian:8
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
index 003b6f4..ba88c8e 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-8-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-8-amd64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: debian-8-latest
     user: debian
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml
index 5cc7f0c..7dcf7cd 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml
@@ -1,11 +1,12 @@
+---
 HOSTS:
   debian-8-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-8-amd64
-    hypervisor : vagrant
-    box : camptocamp/debian-8-amd64
+    hypervisor: vagrant
+    box: camptocamp/debian-8-amd64
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-8.yml b/spec/acceptance/nodesets/debian-8.yml
index 5fb24c6..e6b7701 100644
--- a/spec/acceptance/nodesets/debian-8.yml
+++ b/spec/acceptance/nodesets/debian-8.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   debian-8-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: debian-8-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: debian:8
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml
index 933dee6..93bb624 100644
--- a/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-10.04-x86_64-docker.yml
@@ -1,10 +1,12 @@
+---
+# yamllint disable rule:line-length
 HOSTS:
   ubuntu-1004-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-10.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:10.04
     # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
index f0ec72b..80aeb07 100644
--- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1204-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-12.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:12.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml
index f81b04b..cfe88c3 100644
--- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1204-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-12.04-amd64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: ubuntu-1204-latest
     user: ubuntu
diff --git a/spec/acceptance/nodesets/ubuntu-12.04.yml b/spec/acceptance/nodesets/ubuntu-12.04.yml
index 594e177..13e0d81 100644
--- a/spec/acceptance/nodesets/ubuntu-12.04.yml
+++ b/spec/acceptance/nodesets/ubuntu-12.04.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1204-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-12.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:12.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
index 6fb9281..cd0c0ed 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1404-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-14.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:14.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml
index 2eeb912..760a4b9 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1404-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-14.04-amd64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: ubuntu-1404-latest
     user: ubuntu
diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
index 3b37695..2ae40c5 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
@@ -1,11 +1,12 @@
+---
 HOSTS:
   ubuntu-1404-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-14.04-amd64
-    hypervisor : vagrant
-    box : puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
+    box: puppetlabs/ubuntu-14.04-64-nocm
 CONFIG:
   type: foss
   log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-14.04.yml b/spec/acceptance/nodesets/ubuntu-14.04.yml
index 2b293c9..ca6fd49 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1404-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-14.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:14.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
index 2be425c..f0fe17e 100644
--- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1410-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-14.10-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:14.10
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml
index 58a2acd..aa3a54f 100644
--- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1410-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-14.10-amd64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: ubuntu-1410-latest
     user: ubuntu
diff --git a/spec/acceptance/nodesets/ubuntu-14.10.yml b/spec/acceptance/nodesets/ubuntu-14.10.yml
index 7ce09b2..c253489 100644
--- a/spec/acceptance/nodesets/ubuntu-14.10.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.10.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1410-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-14.10-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:14.10
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
index caed722..50a4f6e 100644
--- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1504-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-15.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:15.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml
index 22ef76c..40fd518 100644
--- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1504-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-15.04-amd64
-    hypervisor : openstack
+    hypervisor: openstack
     flavor: m1.small
     image: ubuntu-1504-latest
     user: ubuntu
diff --git a/spec/acceptance/nodesets/ubuntu-15.04.yml b/spec/acceptance/nodesets/ubuntu-15.04.yml
index 329f331..5e20aa5 100644
--- a/spec/acceptance/nodesets/ubuntu-15.04.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.04.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1504-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-15.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:15.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-15.10.yml b/spec/acceptance/nodesets/ubuntu-15.10.yml
index 487795a..7551cdd 100644
--- a/spec/acceptance/nodesets/ubuntu-15.10.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.10.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1510-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-15.10-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:15.10
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
diff --git a/spec/acceptance/nodesets/ubuntu-16.04.yml b/spec/acceptance/nodesets/ubuntu-16.04.yml
index 6c32b96..73fbdff 100644
--- a/spec/acceptance/nodesets/ubuntu-16.04.yml
+++ b/spec/acceptance/nodesets/ubuntu-16.04.yml
@@ -1,10 +1,11 @@
+---
 HOSTS:
   ubuntu-1604-x64:
     default_apply_opts:
       order: random
       strict_variables:
     platform: ubuntu-16.04-amd64
-    hypervisor : docker
+    hypervisor: docker
     image: ubuntu:16.04
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'