Skip to content

Commit

Permalink
Merge pull request #121 from rwaffen/rls-ready
Browse files Browse the repository at this point in the history
Rls ready
  • Loading branch information
rwaffen committed Dec 11, 2014
2 parents 0180924 + 09bc09d commit 5d53284
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
vendor
*bundle
Gemfile.lock
*.swp
spec/fixtures/modules
spec/fixtures/manifests
.idea
/.project
.project
.vagrant
pkg
Gemfile.lock
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ rvm:
- 2.1.1
- 2.1.2
language: ruby
bundler_args: --without development
bundler_args: --without development --without integration
script: "bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
env:
- PUPPET_GEM_VERSION=3.1.1
Expand Down
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :development, :test do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false, :github => 'rodjek/rspec-puppet', :branch => 'master'
gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
gem 'puppetlabs_spec_helper', :require => false
gem 'serverspec', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
end

group :integration do
gem 'serverspec', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'pry', :require => false
gem 'simplecov', :require => false
end

if facterversion = ENV['FACTER_GEM_VERSION']
Expand Down
9 changes: 0 additions & 9 deletions Modulefile

This file was deleted.

15 changes: 15 additions & 0 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "epost-one",
"version": "1.0.1",
"author": "Deutsche Post E-Post Development GmbH",
"summary": "OpenNebula management module - Manage OpenNebula nodes, management oned, sunstone webinterface",
"license": "Licensed under (Apache 2.0)",
"source": "https://github.com/epost-dev/opennebula-puppet-module",
"project_page": "https://github.com/epost-dev/opennebula-puppet-module",
"issues_url": "https://github.com/epost-dev/opennebula-puppet-module/issues",
"tags": ["opennebula", "sunstone", "management", "oned", "kvm"],
"dependencies": [
{ "name": "puppetlabs/stdlib", "version_requirement": "> 2.2.0" },
{ "name": "puppetlabs/apt" }
]
}

0 comments on commit 5d53284

Please sign in to comment.