Skip to content

Commit

Permalink
Cleanup lint errors and fix invalid license name in metadata.json
Browse files Browse the repository at this point in the history
  • Loading branch information
petecheslock committed Jan 21, 2015
1 parent 5b53234 commit ad25a0f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ source "https://rubygems.org"

gem 'test-kitchen'
gem 'puppet'
gem 'puppet-lint'
gem 'kitchen-puppet'
gem 'kitchen-vagrant'
gem 'serverspec'
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ GEM
facter (> 1.6, < 3)
hiera (~> 1.0)
json_pure
puppet-lint (1.1.0)
rspec (3.1.0)
rspec-core (~> 3.1.0)
rspec-expectations (~> 3.1.0)
Expand Down Expand Up @@ -59,5 +60,6 @@ DEPENDENCIES
kitchen-puppet
kitchen-vagrant
puppet
puppet-lint
serverspec
test-kitchen
6 changes: 3 additions & 3 deletions manifests/configure.pp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class threatstack::configure {

exec { "configure-threatstack-agent":
command => "/opt/threatstack/bin/cloudsight setup --deploy-key=${threatstack::deploy_key} --policy=${threatstack::policy}",
subscribe => Package["$threatstack::ts_package"],
exec { 'configure-threatstack-agent':
command => "/opt/threatstack/bin/cloudsight setup --deploy-key=${threatstack::deploy_key} --policy=${threatstack::policy}",
subscribe => Package[$threatstack::ts_package],
refreshonly => true,
}
}
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
class threatstack(
$deploy_key = '',
$deploy_key = 'none',
$policy = 'Default Policy',
$ts_package = 'threatstack-agent'
) {
if $deploy_key == '' {
if $deploy_key == 'none' {
fail('deploy_key must be defined.')
}

Expand Down
8 changes: 4 additions & 4 deletions manifests/yum.pp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class threatstack::yum {
yumrepo { 'threatstack':
descr => 'Threat Stack Package Repository',
enabled => 1,
baseurl => $threatstack::repo_url,
descr => 'Threat Stack Package Repository',
enabled => 1,
baseurl => $threatstack::repo_url,
gpgcheck => 1,
gpgkey => 'https://www.threatstack.com/RPM-GPG-KEY-THREATSTACK',
gpgkey => 'https://www.threatstack.com/RPM-GPG-KEY-THREATSTACK',
}

package { $threatstack::ts_package:
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "threatstack-threatstack",
"version": "1.0.0",
"author": "Threat Stack",
"license": "Apache 2.0",
"license": "Apache-2.0",
"summary": "Installs the Threat Stack agent",
"source": "https://github.com/threatstack/threatstack-puppet",
"issues_url": "https://github.com/threatstack/threatstack-puppet/issues",
Expand Down

0 comments on commit ad25a0f

Please sign in to comment.