summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-07-07 10:27:59 +0200
committerOlivier Bourdon <obourdon@mirantis.com>2016-07-07 10:28:02 +0200
commit268a0748d626f85d632b2c7d0a7485d9eff9a331 (patch)
tree29dfbf8379bdc3b819f4e424c612ee279a51ecc0
parent632e77f237981cfb3d3f0f49f04f607b4db1edd3 (diff)
Use proper version of puppet-lint
to avoid 'WARNING: variable contains a dash' errors Change-Id: I6fc54a2c36a988f1776201841d00e8870ad7247c
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Code-Review+2: Olivier Bourdon <obourdon@mirantis.com> Workflow+1: Olivier Bourdon <obourdon@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 12 Jul 2016 08:28:55 +0000 Reviewed-on: https://review.openstack.org/338758 Project: openstack/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/Gemfile4
-rw-r--r--deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/Gemfile4
2 files changed, 2 insertions, 6 deletions
diff --git a/deployment_scripts/puppet/manifests/Gemfile b/deployment_scripts/puppet/manifests/Gemfile
index 0562406..b6bab59 100644
--- a/deployment_scripts/puppet/manifests/Gemfile
+++ b/deployment_scripts/puppet/manifests/Gemfile
@@ -17,7 +17,5 @@ group :development, :test do
17 gem 'rake' 17 gem 'rake'
18 gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0' 18 gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
19 gem 'puppetlabs_spec_helper' 19 gem 'puppetlabs_spec_helper'
20 # Need to use master branch of puppet-lint because of 20 gem 'puppet-lint'
21 # https://github.com/rodjek/puppet-lint/issues/355
22 gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
23end 21end
diff --git a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/Gemfile b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/Gemfile
index 0562406..b6bab59 100644
--- a/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/Gemfile
+++ b/deployment_scripts/puppet/modules/plugin_zabbix_monitoring_emc/Gemfile
@@ -17,7 +17,5 @@ group :development, :test do
17 gem 'rake' 17 gem 'rake'
18 gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0' 18 gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.4.0'
19 gem 'puppetlabs_spec_helper' 19 gem 'puppetlabs_spec_helper'
20 # Need to use master branch of puppet-lint because of 20 gem 'puppet-lint'
21 # https://github.com/rodjek/puppet-lint/issues/355
22 gem 'puppet-lint', :git => 'https://github.com/rodjek/puppet-lint.git'
23end 21end