puppetlabs/vmpooler-provider-ec2
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler-provider-ec2.git synced 2026-01-26 02:28:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

set name to spicy proton, fix lifetime

Browse source
This commit is contained in:
Samuel Beaulieu 2022-07-26 09:41:12 -05:00
parent 61c71d6e4e
commit a974045a62
No known key found for this signature in database
GPG key ID: 12030F74136D0F34
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
lib/vmpooler/providers/ec2.rb
View file

@ -205,11 +205,11 @@ module Vmpooler
value: pool_name
},
{
key: 'lifetime',
key: 'lifetime', # required by AWS reaper
value: get_current_lifetime(new_vmname)
},
{
key: 'created_by',
key: 'created_by', # required by AWS reaper
value: get_current_user(new_vmname)
},
{
@ -217,22 +217,20 @@ module Vmpooler
value: get_current_job_url(new_vmname)
},
{
key: 'organization',
key: 'organization', # required by AWS reaper
value: 'engineering'
},
{
key: 'portfolio',
key: 'portfolio', # required by AWS reaper
value: 'ds-ci'
}
]
}
]
if global_config[:config] && global_config[:config]['site_name']
tag.first[:tags] << {
},
{
key: 'Name',
value: global_config[:config]['site_name']
value: new_vmname
}
end
]
}
]
config = {
min_count: 1,
max_count: 1,
@ -447,10 +445,11 @@ module Vmpooler
end
end
# returns lifetime in hours in the format Xh defaults to 1h
def get_current_lifetime(vm_name)
@redis.with_metrics do |redis|
lifetime = redis.hget("vmpooler__vm__#{vm_name}", 'lifetime') || '1h'
return lifetime
lifetime = redis.hget("vmpooler__vm__#{vm_name}", 'lifetime') || '1'
return "#{lifetime}h"
end
end