Update with modulesync

diff --git a/.travis.yml b/.travis.yml
index 572abfd700ff4d7c134a5eaf6ae4d63e0280e3b6..ec3a8ee96e14186e493e63e092232ea5ffe24f14 100644 (file)
--- 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 0cb59337f154124116d24f05f27feb24e612de7d..1d5497f10b006c73fe8533ca8ae9b8dfd76d8199 100644 (file)
--- 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 679afb04d892bfa2c6e26e8e385e794eef15f07a..b7ed0e50887aa5f5e0c5e67246a5ca784e70ceac 100644 (file)
--- 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 9cab03d08d3affa46d58ead104611bccda490da9..c82c10de40e557069471b22742a574b2a3848969 100644 (file)
--- 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 e325b9e90d6f7f2c7daf48a931ea748ce80db825..2d1b9a9da0138bf8dcb3dd530bdb31e6551e537e 100644 (file)
--- 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 f06036ecce4dbf5b52af185cabe216880c24feba..9fa6d9e4d2cbe4cd80c12084962ab4461ac0d677 100644 (file)
--- 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 0bc972711c90e6672152fb4e976cfbd7e07ffedb..bc57539167a23444c72f5c6251408d77a227ae1c 100644 (file)
--- 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 9003c8678d5ecd398e030e6e9155aef658febafb..04dfefe59b583315344391414c4fee593a8a12ed 100644 (file)
--- 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 95402e54697cb5c5c064abdaf6946d2d0253283b..b7280489b55b6e82b9027d34025c8e654b5272ea 100644 (file)
--- 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 359dae7dc66e3f7dfd227f9dac947b3381c700d0..3e53be362282d62f9fdca117a4f998f1c606b228 100644 (file)
--- 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 c6c192fe406215b97342ced635e9270202dea8c1..b77e1972584c6be16719b80af4ac3838d4fc6999 100644 (file)
--- 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 03db0fa76bac06c05ca25afa84181b05e9fd0277..4fd10e1ddf68b4df9fe1585b2c8ba1a1491bd83e 100644 (file)
--- 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 fc11f5748abda4a8a4a0c92241b0d0cb5a1f5fdd..9591ea778ae983fe007777e4940a2d4fae29a717 100644 (file)
--- 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 017b4c7432c3c2636bd8da028caec8fbd186f279..4bd8f46748b7f3a73ea183f063333a91365c8b62 100644 (file)
--- 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 8ed1264dffb88e2bd4c3864892ea2bcedcb393b6..2b2ce4c1f66809e63eb1164fdc797d6300fb6c7b 100644 (file)
--- 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 86a55e156924cea2997448b4eb15a5f9d4f53679..5fb24c61734669d767c27b7273543ac936058950 100644 (file)
--- 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 003b6f4bd7b02346ab9f7762987146bb752a7470..38ad3c4ba5180268769c23d62be7d6451782df88 100644 (file)
--- 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 5cc7f0c5a08b08b3e1469634916d90744320c389..cd87e92ab2ee26379c8e95678a6cd666d95c98ca 100644 (file)
--- 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 f0ec72b86ef254ad92c05db13057dc0531c1eaa6..594e17719daf85d0a54edf41b02c161269a9153e 100644 (file)
--- 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 f81b04b748992ff95874d38dfb3cbeb29adfa209..9ddc530082722cdf0118ff3316d3c5e67491b502 100644 (file)
--- 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 6fb9281e5d64fb68d1387fbd07d4f34118794413..2b293c99abf7d960668ba520f1f3f0381f3a49e5 100644 (file)
--- 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 2eeb912d90c960eaf766d7ee2539890c6a4e2832..f924d8739f65f40bc5c2b1c191d1ce7767998850 100644 (file)
--- 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 3b376953920ffc6150f6de156c962bcb02cdc0c9..e486aadc76922067418c7ed8092587687040e642 100644 (file)
--- 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 2be425c543df7c91f36ab7cb2880c5880a53e4c9..7ce09b2a84864ab4ce7ead3b7b2db6807331649d 100644 (file)
--- 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 58a2acd26ac0a225a9820564df1d3a188411c119..74f829948d113dc80c7201fcb1d8fa7a59dd0c03 100644 (file)
--- 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 caed722c2773332ce02060d2cba6ee3dc627a5fe..329f3319e7431899230f892b58b5b7419cb88ced 100644 (file)
--- 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 22ef76c4e0749bce7310dbe41c64998393b3b4d6..37c48fbd04e290eb780b8ae6d9201f98d50a27b8 100644 (file)
--- 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 (file)
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