Skip to content

Commit

Permalink
Fix missing dependancies for testing frameworks
Browse files Browse the repository at this point in the history
  • Loading branch information
yankcrime committed Jan 18, 2018
1 parent 77c7edd commit fba498a
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 14 deletions.
13 changes: 7 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ gem 'rake'
gem 'safe_yaml', '~> 1.0.4'
gem 'metadata-json-lint'
gem 'toml-rb'
gem 'semantic_puppet'

group :test do
gem "beaker"
gem "beaker-rspec"
gem 'beaker'
gem 'beaker-rspec'
gem 'beaker-puppet_install_helper'
gem "puppet", ENV['PUPPET_VERSION'] || "> 3.7.0"
gem "puppetlabs_spec_helper"
gem "rspec"
gem "rspec-puppet"
gem 'puppet', ENV['PUPPET_VERSION'] || '> 3.7.0'
gem 'puppetlabs_spec_helper'
gem 'rspec'
gem 'rspec-puppet'
end
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# telegraf

[![Build Status](https://travis-ci.org/datacentred/puppet-telegraf.png?branch=master)](https://travis-ci.org/datacentred/puppet-telegraf)
[![Build Status](https://travis-ci.org/yankcrime/puppet-telegraf.png?branch=master)](https://travis-ci.org/yankcrime/puppet-telegraf)

#### Table of Contents

Expand All @@ -26,12 +26,12 @@ This module has the following dependencies:
for TLS-enabled repos in place. This can be achieved by installing the
`apt-transport-https` package.

This module **requires** the [toml-rb](https://github.com/eMancu/toml-rb) gem. Either install the gem using puppet's native gem provider, [puppetserver_gem](https://forge.puppetlabs.com/puppetlabs/puppetserver_gem), [pe_gem](https://forge.puppetlabs.com/puppetlabs/pe_gem), [pe_puppetserver_gem](https://forge.puppetlabs.com/puppetlabs/pe_puppetserver_gem), or manually using one of the following:
This module **requires** the [toml-rb](https://github.com/eMancu/toml-rb) gem. Either install the gem using puppet's native gem provider, [puppetserver_gem](https://forge.puppetlabs.com/puppetlabs/puppetserver_gem), [pe_gem](https://forge.puppetlabs.com/puppetlabs/pe_gem), [pe_puppetserver_gem](https://forge.puppetlabs.com/puppetlabs/pe_puppetserver_gem), or manually using one of the following methods:
```
# apply or puppet-master
gem install toml-rb
# PE apply
/opt/puppet/bin/gem install toml

This comment has been minimized.

Copy link
@tardoe

tardoe Jan 18, 2018

Contributor

This broke my puppetmaster with this module already installed as toml was installed but not toml-rb.

/opt/puppetlabs/puppet/bin/gem install toml-rb
# AIO or PE puppetserver
/opt/puppet/bin/puppetserver gem install toml-rb
```
Expand Down
2 changes: 1 addition & 1 deletion manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
descr => "InfluxData Repository - ${::operatingsystem} \$releasever",
enabled => 1,
baseurl => "${::telegraf::repo_location}rhel/\$releasever/\$basearch/${::telegraf::repo_type}",
gpgkey => '${::telegraf::repo_location}influxdb.key',
gpgkey => "${::telegraf::repo_location}influxdb.key",
gpgcheck => 1,
}
Yumrepo['influxdata'] -> Package[$::telegraf::package_name]
Expand Down
8 changes: 4 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "datacentred-telegraf",
"version": "1.5.0",
"author": "DataCentred Ltd",
"author": "Nick Jones",
"summary": "Configuration and management of InfluxData's Telegraf metrics collection agent",
"license": "GPL-3.0",
"source": "https://github.com/datacentred/puppet-telegraf",
"project_page": "https://github.com/datacentred/puppet-telegraf",
"issues_url": "https://github.com/datacentred/puppet-telegraf/issues",
"source": "https://github.com/yankcrime/puppet-telegraf",
"project_page": "https://github.com/yankcrime/puppet-telegraf",
"issues_url": "https://github.com/yankcrime/puppet-telegraf/issues",
"tags": ["telegraf","influxdb","influxdata"],
"operatingsystem_support": [
{
Expand Down
6 changes: 6 additions & 0 deletions spec/spec.opts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
--format
s
--colour
--loadby
mtime
--backtrace
1 change: 1 addition & 0 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
end
on host, puppet('module', 'install', 'puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module', 'install', 'puppetlabs-apt'), { :acceptable_exit_codes => [0,1] }
on host, '/opt/puppetlabs/puppet/bin/gem install toml-rb'
end
end
end

0 comments on commit fba498a

Please sign in to comment.