|
|
@ -75,6 +75,13 @@ options:
|
|
|
|
required: false
|
|
|
|
required: false
|
|
|
|
default: null
|
|
|
|
default: null
|
|
|
|
aliases: []
|
|
|
|
aliases: []
|
|
|
|
|
|
|
|
spot_type:
|
|
|
|
|
|
|
|
description:
|
|
|
|
|
|
|
|
- Type of spot request; one of "one-time" or "persistent". Defaults to "one-time" if not supplied.
|
|
|
|
|
|
|
|
required: false
|
|
|
|
|
|
|
|
default: "one-time"
|
|
|
|
|
|
|
|
choices: [ "one-time", "persistent" ]
|
|
|
|
|
|
|
|
aliases: []
|
|
|
|
image:
|
|
|
|
image:
|
|
|
|
description:
|
|
|
|
description:
|
|
|
|
- I(ami) ID to use for the instance
|
|
|
|
- I(ami) ID to use for the instance
|
|
|
@ -759,6 +766,7 @@ def create_instances(module, ec2, vpc, override_count=None):
|
|
|
|
instance_type = module.params.get('instance_type')
|
|
|
|
instance_type = module.params.get('instance_type')
|
|
|
|
tenancy = module.params.get('tenancy')
|
|
|
|
tenancy = module.params.get('tenancy')
|
|
|
|
spot_price = module.params.get('spot_price')
|
|
|
|
spot_price = module.params.get('spot_price')
|
|
|
|
|
|
|
|
spot_type = module.params.get('spot_type')
|
|
|
|
image = module.params.get('image')
|
|
|
|
image = module.params.get('image')
|
|
|
|
if override_count:
|
|
|
|
if override_count:
|
|
|
|
count = override_count
|
|
|
|
count = override_count
|
|
|
@ -951,6 +959,7 @@ def create_instances(module, ec2, vpc, override_count=None):
|
|
|
|
|
|
|
|
|
|
|
|
params.update(dict(
|
|
|
|
params.update(dict(
|
|
|
|
count = count_remaining,
|
|
|
|
count = count_remaining,
|
|
|
|
|
|
|
|
type = spot_type,
|
|
|
|
))
|
|
|
|
))
|
|
|
|
res = ec2.request_spot_instances(spot_price, **params)
|
|
|
|
res = ec2.request_spot_instances(spot_price, **params)
|
|
|
|
|
|
|
|
|
|
|
@ -1179,6 +1188,7 @@ def main():
|
|
|
|
zone = dict(aliases=['aws_zone', 'ec2_zone']),
|
|
|
|
zone = dict(aliases=['aws_zone', 'ec2_zone']),
|
|
|
|
instance_type = dict(aliases=['type']),
|
|
|
|
instance_type = dict(aliases=['type']),
|
|
|
|
spot_price = dict(),
|
|
|
|
spot_price = dict(),
|
|
|
|
|
|
|
|
spot_type = dict(default='one-time'),
|
|
|
|
image = dict(),
|
|
|
|
image = dict(),
|
|
|
|
kernel = dict(),
|
|
|
|
kernel = dict(),
|
|
|
|
count = dict(type='int', default='1'),
|
|
|
|
count = dict(type='int', default='1'),
|
|
|
|