Skip to content

Commit 4eb529c

Browse files
committed
(maint) pass full inventory path to task
1 parent 144ba65 commit 4eb529c

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

lib/puppet_litmus/rake_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def provision(provisioner, platform, inventory_vars)
6868
raise "the provision module was not found in #{DEFAULT_CONFIG_DATA['modulepath']}, please amend the .fixtures.yml file" unless
6969
File.directory?(File.join(DEFAULT_CONFIG_DATA['modulepath'], 'provision'))
7070

71-
params = { 'action' => 'provision', 'platform' => platform, 'inventory' => Dir.pwd }
71+
params = { 'action' => 'provision', 'platform' => platform, 'inventory' => File.join(Dir.pwd, 'spec', 'fixtures', 'litmus_inventory.yaml') }
7272
params['vars'] = inventory_vars unless inventory_vars.nil?
7373

7474
task_name = provisioner_task(provisioner)

spec/lib/puppet_litmus/rake_helper_spec.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
end
2525

2626
RSpec.describe PuppetLitmus::RakeHelper do
27+
let(:inventory_file) { File.join(Dir.pwd, 'spec', 'fixtures', 'litmus_inventory.yaml') }
28+
2729
context 'with provision_list' do
2830
let(:provision_hash) { { 'default' => { 'provisioner' => 'docker', 'images' => ['waffleimage/centos7'] } } }
2931
let(:results) { [] }
@@ -42,15 +44,15 @@
4244
inventory_vars: nil,
4345
provision_hash: { 'default' => { 'provisioner' => 'docker', 'images' => ['waffleimage/centos7'] } },
4446
results: [],
45-
params: { 'action' => 'provision', 'platform' => 'waffleimage/centos7', 'inventory' => Dir.pwd }
47+
params: { 'action' => 'provision', 'platform' => 'waffleimage/centos7', 'inventory' => inventory_file }
4648
},
4749
{
4850
provisioner: 'vagrant',
4951
platform: 'centos7',
5052
inventory_vars: nil,
5153
provision_hash: { 'default' => { 'provisioner' => 'vagrant', 'images' => ['centos7'] } },
5254
results: [],
53-
params: { 'action' => 'provision', 'platform' => 'centos7', 'inventory' => Dir.pwd }
55+
params: { 'action' => 'provision', 'platform' => 'centos7', 'inventory' => inventory_file }
5456
}
5557
].freeze
5658

@@ -68,7 +70,7 @@
6870
[{ 'uri' => 'some.host', 'facts' => { 'provisioner' => 'docker', 'container_name' => 'foo', 'platform' => 'some.host' } }] }] }
6971
end
7072
let(:targets) { ['some.host'] }
71-
let(:params) { { 'action' => 'tear_down', 'node_name' => 'some.host', 'inventory' => Dir.pwd } }
73+
let(:params) { { 'action' => 'tear_down', 'node_name' => 'some.host', 'inventory' => inventory_file } }
7274

7375
it 'calls function' do
7476
allow(File).to receive(:directory?).with(File.join(described_class::DEFAULT_CONFIG_DATA['modulepath'], 'provision')).and_return(true)
@@ -89,7 +91,7 @@
8991
] }] }
9092
end
9193
let(:targets) { ['one.host'] }
92-
let(:params) { { 'action' => 'tear_down', 'node_name' => 'one.host', 'inventory' => Dir.pwd } }
94+
let(:params) { { 'action' => 'tear_down', 'node_name' => 'one.host', 'inventory' => inventory_file } }
9395

9496
it 'calls function' do
9597
allow(File).to receive(:directory?).with(File.join(described_class::DEFAULT_CONFIG_DATA['modulepath'], 'provision')).and_return(true)

0 commit comments

Comments
 (0)