Update with modulesync

28 files changed, 66 insertions, 35 deletions

diff --git a/.travis.yml b/.travis.yml
index 572abfd..ec3a8ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,10 @@
 ---
 language: ruby
 sudo: false
+addons:
+  apt:
+    packages:
+      - libaugeas-dev
 cache: bundler
 bundler_args: --without system_tests
 script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
diff --git a/Gemfile b/Gemfile
index 0cb5933..1d5497f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,8 @@ group :development, :unit_tests do
   gem 'puppet-lint-file_source_rights-check',              :require => false
   gem 'puppet-lint-alias-check',                           :require => false
   gem 'rspec-puppet-facts',                                :require => false
-  gem 'github_changelog_generator',                        :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches' if RUBY_VERSION !~ /^1.8/
+  gem 'ruby-augeas',                                       :require => false
+  gem 'github_changelog_generator',                        :require => false if RUBY_VERSION !~ /^1.8/
   gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1.8/
 end
 
diff --git a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
index 679afb0..b7ed0e5 100644
--- a/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-5-x86_64-docker.yml
@@ -5,11 +5,11 @@ HOSTS:
       strict_variables:
     platform: el-5-x86_64
     hypervisor : docker
-    image: centos:5
+    image: tianon/centos:5.10
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'yum install -y crontabs tar wget'
+      - 'yum install -y crontabs tar wget which'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
index 9cab03d..c82c10d 100644
--- a/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-docker.yml
@@ -9,7 +9,8 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
+      - 'rm -rf /var/run/network/*'
       - 'yum install -y crontabs tar wget'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
index e325b9e..2d1b9a9 100644
--- a/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: centos-6-latest
     user: root
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
diff --git a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
index f06036e..9fa6d9e 100644
--- a/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-6-x86_64-vagrant.yml
@@ -7,5 +7,5 @@ HOSTS:
     hypervisor : vagrant
     box : camptocamp/centos-6-x86_64
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
index 0bc9727..bc57539 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml
@@ -11,5 +11,5 @@ HOSTS:
     docker_image_commands:
       - 'yum install -y crontabs tar wget'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
index 9003c86..04dfefe 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: centos-7-latest
     user: centos
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
index 95402e5..b728048 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -7,5 +7,5 @@ HOSTS:
     hypervisor : vagrant
     box : camptocamp/centos-7-x86_64
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
index 359dae7..3e53be3 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'apt-get install -y cron locales-all net-tools wget'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
index c6c192f..b77e197 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: debian-6-latest
     user: debian
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
index 03db0fa..4fd10e1 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
@@ -7,5 +7,5 @@ HOSTS:
     hypervisor : vagrant
     box : puppetlabs/debian-6.0.10-64-nocm
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
index fc11f57..9591ea7 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y cron wget'
+      - 'apt-get install -y cron locales-all net-tools wget'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
index 017b4c7..4bd8f46 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: debian-7-latest
     user: debian
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
index 8ed1264..2b2ce4c 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -7,5 +7,5 @@ HOSTS:
     hypervisor : vagrant
     box : camptocamp/debian-7-amd64
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
index 86a55e1..5fb24c6 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml
@@ -9,7 +9,8 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y cron wget'
+      - 'apt-get install -y cron locales-all net-tools wget'
+      - 'rm -f /usr/sbin/policy-rc.d'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
index 003b6f4..38ad3c4 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: debian-8-latest
     user: debian
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
diff --git a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml
index 5cc7f0c..cd87e92 100644
--- a/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-8-x86_64-vagrant.yml
@@ -7,5 +7,5 @@ HOSTS:
     hypervisor : vagrant
     box : camptocamp/debian-8-amd64
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
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..594e177 100644
--- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
@@ -9,7 +9,8 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
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..9ddc530 100644
--- a/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-12.04-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: ubuntu-1204-latest
     user: ubuntu
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
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..2b293c9 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
@@ -9,7 +9,10 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'rm /usr/sbin/policy-rc.d'
+      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
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..f924d87 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: ubuntu-1404-latest
     user: ubuntu
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
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..e486aad 100644
--- a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
@@ -7,5 +7,5 @@ HOSTS:
     hypervisor : vagrant
     box : puppetlabs/ubuntu-14.04-64-nocm
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
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..7ce09b2 100644
--- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
@@ -9,7 +9,10 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'rm /usr/sbin/policy-rc.d'
+      - 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
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..74f8299 100644
--- a/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-14.10-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: ubuntu-1410-latest
     user: ubuntu
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
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..329f331 100644
--- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
@@ -9,7 +9,8 @@ HOSTS:
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -y wget'
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
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..37c48fb 100644
--- a/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml
+++ b/spec/acceptance/nodesets/ubuntu-15.04-x86_64-openstack.yml
@@ -9,6 +9,6 @@ HOSTS:
     image: ubuntu-1504-latest
     user: ubuntu
 CONFIG:
-  type: foss
+  type: aio
   log_level: debug
   openstack_network: default
diff --git a/spec/acceptance/nodesets/ubuntu-15.10-x86_64-docker.yml b/spec/acceptance/nodesets/ubuntu-15.10-x86_64-docker.yml
new file mode 100644
index 0000000..487795a
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-15.10-x86_64-docker.yml
@@ -0,0 +1,16 @@
+HOSTS:
+  ubuntu-1510-x64:
+    default_apply_opts:
+      order: random
+      strict_variables:
+    platform: ubuntu-15.10-amd64
+    hypervisor : docker
+    image: ubuntu:15.10
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y net-tools wget'
+      - 'locale-gen en_US.UTF-8'
+CONFIG:
+  type: aio
+  log_level: debug