fix tear_down from puppet_litmus

puppet_litmus gem is passing the target uri as the node_name param, which causes an InventoryHelper.lookup exception.
puppetlabs · Jul 9, 2024 · 3370249 · 3370249
1 parent 775430e
commit 3370249
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tasks/docker.rb b/tasks/docker.rb
@@ -207,7 +207,7 @@ def provision(docker_platform, inventory, vars)
 begin
  result = provision(platform, inventory, vars) if action == 'provision'
  if action == 'tear_down'
- node = inventory.lookup(name: node_name, group: 'ssh_nodes')
+ node = inventory.lookup(node_name, group: 'ssh_nodes')
  result = docker_tear_down(node['facts']['container_id'])
  inventory.remove(node).save
  end

diff --git a/tasks/docker_exp.rb b/tasks/docker_exp.rb
@@ -79,7 +79,7 @@ def provision(docker_platform, inventory, vars)
 begin
  result = provision(platform, inventory, vars) if action == 'provision'
  if action == 'tear_down'
- node = inventory.lookup(name: node_name, group: 'docker_nodes')
+ node = inventory.lookup(node_name, group: 'docker_nodes')
  result = docker_tear_down(node['facts']['container_id'])
  inventory.remove(node).save
  end

diff --git a/tasks/provision_service.rb b/tasks/provision_service.rb
@@ -138,7 +138,7 @@ def tear_down(node_name, inventory, _vars, retry_attempts)
  # remove all provisioned resources
  uri = URI.parse(ENV['SERVICE_URL'] || default_uri)
 
- node = inventory.lookup(name: node_name)
+ node = inventory.lookup(node_name)
  facts = node['facts']
  job_id = facts['uuid']
  response = invoke_cloud_request(job_id, uri, '', 'delete', retry_attempts)

diff --git a/tasks/vagrant.rb b/tasks/vagrant.rb
@@ -197,7 +197,7 @@ def provision(platform, inventory, enable_synced_folder, provider, cpus, memory,
 
 def tear_down(node_name, inventory)
  command = 'vagrant destroy -f'
- node = inventory.lookup(name: node_name, group: 'ssh_nodes')
+ node = inventory.lookup(node_name, group: 'ssh_nodes')
  vagrant_env = node['facts']['vagrant_env']
  run_local_command(command, vagrant_env)
  FileUtils.rm_r(vagrant_env)