Skip to content

fix tear_down from puppet_litmus #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix tear_down from puppet_litmus #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tasks/docker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tasks/docker_exp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tasks/provision_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tasks/vagrant.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down