Skip to content
Browse files

removed hardcoded manifests path from puppet apply

  • Loading branch information...
1 parent ad05345 commit 25a2c0905372dfac10ec97815dfdc35a02d15f75 @frankmt committed Feb 14, 2012
Showing with 10 additions and 10 deletions.
  1. +8 −8 features/puppet.feature
  2. +1 −1 lib/toft/puppet/puppet_runner.rb
  3. +1 −1 lib/toft/version.rb
View
16 features/puppet.feature
@@ -2,48 +2,48 @@ Feature: Puppet support
Scenario: Run Puppet manifest on nodes
Given I have a clean running node n1
- When I run puppet manifest "test.pp" on node "n1"
+ When I run puppet manifest "manifests/test.pp" on node "n1"
Then Node "n1" should have file or directory "/tmp/puppet_test"
Scenario: Run puppet manifest with included nodes
Given I have a clean running node n1
And I change the internal hostname for "n1" to "correct.puppet.com"
- And I run puppet manifest "site.pp" on node "n1"
+ And I run puppet manifest "manifests/site.pp" on node "n1"
Then Node "n1" should have file or directory "/tmp/puppet_test_correct"
And Node "n1" should have file or directory "/tmp/puppet_test_default"
And Node "n1" should have not file or directory "/tmp/puppet_test_incorrect"
Scenario: Run puppet manifest with modules
Given I have a clean running node n1
- When I run puppet manifest "test_module.pp" with config file "puppet_modules.conf" on node "n1"
+ When I run puppet manifest "manifests/test_module.pp" with config file "puppet_modules.conf" on node "n1"
Then Node "n1" should have file or directory "/tmp/puppet_test_module"
Scenario: Run puppet manifest with static files being served by fileserver
Given I have a clean running node n1
- When I run puppet manifest "test_fileserver.pp" with config file "puppet_fileserver.conf" on node "n1"
+ When I run puppet manifest "manifests/test_fileserver.pp" with config file "puppet_fileserver.conf" on node "n1"
Then Node "n1" should have file or directory "/tmp/puppet_test_fileserver"
Scenario: Run puppet manifest with template dir configuration
Given I have a clean running node n1
- When I run puppet manifest "test_template.pp" with config file "puppet_template.conf" on node "n1"
+ When I run puppet manifest "manifests/test_template.pp" with config file "puppet_template.conf" on node "n1"
Then Node "n1" should have file or directory "/tmp/puppet_test_template"
Scenario: Check that package was installed on centos box
Given I have a clean running node n1
- When I run puppet manifest "test_install.pp" on node "n1"
+ When I run puppet manifest "manifests/test_install.pp" on node "n1"
Then Node "n1" should have package "zip" installed in the centos box
Scenario: Check that service is running on centos box
Given I have a clean running node n1
- When I run puppet manifest "test_service.pp" on node "n1"
+ When I run puppet manifest "manifests/test_service.pp" on node "n1"
Then Node "n1" should have service "named" running in the centos box
Scenario: Run puppet manifest overriding conf settings
Given I have a clean running node n1
And node "n1" has the configuration settings:
|key|value|
|modulepath|/tmp/toft-puppet-tmp/modules|
- When I run puppet manifest "test_module.pp" on node "n1"
+ When I run puppet manifest "manifests/test_module.pp" on node "n1"
Then Node "n1" should have file or directory "/tmp/puppet_test_module"
View
2 lib/toft/puppet/puppet_runner.rb
@@ -16,7 +16,7 @@ def initialize(root_dir, &command_runner)
def run(run_list, params = {})
copy_puppet_material
copy_conf_file(params[:conf_file]) if params[:conf_file]
- @command_runner.call "puppet apply #{DEST_PUPPET_TMP}/manifests/#{run_list}"
+ @command_runner.call "puppet apply #{DEST_PUPPET_TMP}/#{run_list}"
end
private
View
2 lib/toft/version.rb
@@ -1,3 +1,3 @@
module Toft
- VERSION = "0.0.10"
+ VERSION = "0.0.11"
end

0 comments on commit 25a2c09

Please sign in to comment.
Something went wrong with that request. Please try again.