From c0d887da57163fcf4d1c2d4508876d5e8bcecc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Wed, 4 Feb 2015 10:31:01 +0100 Subject: [PATCH 1/6] Add puppet-lint-leading_zero-check gem --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index f1bdbfc8..c9823f6b 100644 --- a/Gemfile +++ b/Gemfile @@ -11,6 +11,7 @@ group :development, :unit_tests do gem 'puppet-lint-variable_contains_upcase', :require => false gem 'puppet-lint-absolute_classname-check', :require => false gem 'puppet-lint-undef_in_function-check', :require => false + gem 'puppet-lint-leading_zero-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false From 509405a55706df011095cc183ce23dea3276d565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 4 Feb 2015 11:03:54 +0100 Subject: [PATCH 2/6] Update with modulesync --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c9823f6b..3190b060 100644 --- a/Gemfile +++ b/Gemfile @@ -2,9 +2,9 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org" group :development, :unit_tests do gem 'rake', :require => false - gem 'rspec-puppet', :require => false, :git => 'https://github.com/camptocamp/rspec-puppet.git', :branch => 'rspec3' + gem 'rspec-puppet', '~> 2.0', :require => false gem 'puppetlabs_spec_helper', :require => false - gem 'puppet-lint', '~> 1.0.0', :require => false + gem 'puppet-lint', :require => false gem 'puppet-lint-unquoted_string-check', :require => false gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false From a560b894dcd54430c9bd1d9879d7eb2c3e935b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 6 Feb 2015 12:00:29 +0100 Subject: [PATCH 3/6] Clear lint rake task --- Rakefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Rakefile b/Rakefile index a81b2c6f..a334275d 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,7 @@ require 'puppetlabs_spec_helper/rake_tasks' require 'puppet-lint/tasks/puppet-lint' +Rake::Task[:lint].clear PuppetLint.configuration.fail_on_warnings PuppetLint.configuration.send('relative') PuppetLint.configuration.send('disable_80chars') From cd880c1174b48112afc330731211fb24c4c0abd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Fri, 6 Feb 2015 13:29:30 +0100 Subject: [PATCH 4/6] [ci skip] Fix hostname in nodesets --- spec/acceptance/nodesets/centos-7-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/centos-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-6-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-openstack.yml | 2 +- spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-docker.yml | 2 +- spec/acceptance/nodesets/debian-8-x86_64-openstack.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml index 6eb5641a..599a681f 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - centos-7-x86_64: + centos-7-x64: default_apply_opts: strict_variables: platform: el-7-x86_64 diff --git a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml index 69d1bfc0..37dfc5f9 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - centos-7-x86_64: + centos-7-x64: default_apply_opts: strict_variables: platform: el-7-x86_64 diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml index d4794280..a9c461ba 100644 --- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml @@ -1,5 +1,5 @@ HOSTS: - centos-7-x86_64: + centos-7-x64: default_apply_opts: strict_variables: platform: el-7-x86_64 diff --git a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml index b6cf1e6d..0296d129 100644 --- a/spec/acceptance/nodesets/debian-6-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-6-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - debian-6-x86_64: + debian-6-x64: default_apply_opts: strict_variables: platform: debian-6-amd64 diff --git a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml index e7b916bc..ef1c9b22 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - debian-7-x86_64: + debian-7-x64: default_apply_opts: strict_variables: platform: debian-7-amd64 diff --git a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml index 0643d036..e52336be 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - debian-7-x86_64: + debian-7-x64: default_apply_opts: strict_variables: platform: debian-7-amd64 diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml index 30f31ad9..97099de3 100644 --- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml +++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml @@ -1,5 +1,5 @@ HOSTS: - debian-7-x86_64: + debian-7-x64: default_apply_opts: strict_variables: platform: debian-7-amd64 diff --git a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml index ef99efb9..28c3e02f 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-docker.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-docker.yml @@ -1,5 +1,5 @@ HOSTS: - debian-8-x86_64: + debian-8-x64: default_apply_opts: strict_variables: platform: debian-8-amd64 diff --git a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml index 1cc9c6d8..194ca460 100644 --- a/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml +++ b/spec/acceptance/nodesets/debian-8-x86_64-openstack.yml @@ -1,5 +1,5 @@ HOSTS: - debian-8-x86_64: + debian-8-x64: default_apply_opts: strict_variables: platform: debian-8-amd64 From 89055a9946536edd1c010a1450217f1ced4ca8cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Pinson?= Date: Tue, 10 Feb 2015 11:29:25 +0100 Subject: [PATCH 5/6] Modulesync --- Gemfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 3190b060..f0887eca 100644 --- a/Gemfile +++ b/Gemfile @@ -12,14 +12,17 @@ group :development, :unit_tests do gem 'puppet-lint-absolute_classname-check', :require => false gem 'puppet-lint-undef_in_function-check', :require => false gem 'puppet-lint-leading_zero-check', :require => false + gem 'puppet-lint-trailing_comma-check', :require => false + gem 'puppet-lint-file_ensure-check', :require => false gem 'simplecov', :require => false gem 'rspec-puppet-facts', :require => false gem 'json', :require => false gem 'metadata-json-lint', :require => false + gem 'docker-api', '1.15.0', :require => false end group :system_tests do - gem 'beaker', :require => false, :git => 'https://github.com/mcanevet/beaker', :branch => 'openstack' + gem 'beaker', :require => false, :git => 'https://github.com/raphink/beaker', :branch => 'openstack' gem 'beaker-rspec', :require => false gem 'serverspec', :require => false end From 4af00f9104eee729a961cc1ad77fb9fe6f2101a1 Mon Sep 17 00:00:00 2001 From: Ben Hocker Date: Wed, 11 Feb 2015 08:34:56 -0600 Subject: [PATCH 6/6] Fixes issue #69 ldap-alias maps --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index db2a097a..67db3cb8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -132,7 +132,7 @@ $all_alias_maps = $ldap ? { false => $alias_maps, - true => "\"${alias_maps}, ldap:/etc/postfix/ldap-aliases.cf\"", + true => "${alias_maps}, ldap:/etc/postfix/ldap-aliases.cf", } anchor { 'postfix::begin': } ->