ec2_instance: Fix launch template condition, handle launch template - default value for instance_type #587

mandar242 · 2021-12-09T01:25:59Z

SUMMARY

The launch_template option in ec2_instance has a broken condition.
Also the launch_template option defaults the instance_type to t2.micro if not specified and ignores the instance_type specified in the launch_template as said in the issue #451.

Fixes

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

ec2_instance

ADDITIONAL INFORMATION

The change does not break existing functionality as tested by the integration test run locally.
Related to the condition fix in community.aws: ansible-collections/community.aws#111

Ran the following playbook to verify the change.

# create a launch template called "test-launch-template" 
    - name: create test launch template
      community.aws.ec2_launch_template:
        template_name: test-launch-template
        image_id: ami-002068ed284xxxxxx
        instance_type: t3a.small
        network_interfaces:
          - associate_public_ip_address: no
            delete_on_termination: yes
            device_index: 0
            groups:
              - sg-xxxxxxxxxxxxxxxxxx
            subnet_id: subnet-xxxxxxxxxxxxxxxxxx
        region: us-east-2
        block_device_mappings:
          - device_name: /dev/sdb
            ebs:
              volume_size: 5
              volume_type: gp3
              delete_on_termination: true
              encrypted: yes
          - device_name: /dev/sdc
            ebs:
              volume_size: 2
              volume_type: gp2
              delete_on_termination: true
              encrypted: no
        tags:
          ssome: tags

# launch a ec2 instance using launch template created earlier - launches t3a.small instance as expected
    - name: test launch template usage
      ec2_instance:
        wait: yes
        name: "test-instance-mk-t3a.small"
        launch_template:
          name: test-launch-template
        vpc_subnet_id: subnet-xxxxxxxxxxxxxxxxxx

# launch ec2 instance using launch template created earlier - override instance type to be launch to t3.xlarge
    - name: test launch template usage - override instance type
      ec2_instance:
        wait: yes
        name: "test-instance-mk-t3.xlarge"
        instance_type: t3.xlarge
        launch_template:
          name: test-launch-template
        vpc_subnet_id: subnet-xxxxxxxxxxxxxxxxxx

mandar242 · 2021-12-09T01:36:54Z

Hi @markuman, can you take please a look at this for #451, this change would

Fix the broken condition here for launch_template as fixed earlier by ec2_instance: fix launch_template condition community.aws#111
Handle the default value for instance_type to not force t2.micro in use cases for launch_template.

If this approach looks like a possible solution, I can work for adding few integration tests for the change.

plugins/modules/ec2_instance.py

markuman

A changelog fragment is missing.

mandar242 · 2021-12-20T17:55:03Z

recheck

emanuele-leopardi

LGTM, in fact I think it doesn't make sense to have a default here. IMO, I'd rather have a failing playbook just because I forgot to pick an instance type, instead of a default value :)

changelogs/fragments/587-ec2_instance-default-instance-type-launch-template.yml

alinabuzachis · 2022-01-07T08:42:44Z

plugins/modules/ec2_instance.py

+
+    if not module.params.get('instance_type') and not module.params.get('launch_template'):
+        module.deprecate("Default value instance_type has been deprecated, in the future you must set an instance_type or a launch_template",
+                         date='2023-01-01', collection_name='amazon.aws')


@jillr Just an info, do we use date or collection version for deprecations?

@mandar242 Other than that, it looks good to me. Thank you for taking time to work on this.

@alinabuzachis date, we don't expect to always have the same cadence of major collection releases

jillr · 2022-01-12T20:51:57Z

recheck

softwarefactory-project-zuul · 2022-01-12T21:46:45Z

Build failed.

ansible-galaxy-importer : SUCCESS in 4m 58s
build-ansible-collection : SUCCESS in 6m 17s
ansible-test-sanity-aws-ansible-python38 : SUCCESS in 11m 40s
ansible-test-sanity-aws-ansible-2.9-python38 : FAILURE in 12m 20s
ansible-test-sanity-aws-ansible-2.11-python38 : SUCCESS in 11m 17s
ansible-test-units-amazon-aws-python38 : SUCCESS in 9m 08s
ansible-test-splitter : SUCCESS in 14m 44s
ansible-test-cloud-integration-aws-py38_0 : SUCCESS in 37m 09s
ansible-test-cloud-integration-aws-py38_1 : SKIPPED
ansible-test-cloud-integration-aws-py38_2 : SKIPPED
ansible-test-cloud-integration-aws-py38_3 : SKIPPED
ansible-test-cloud-integration-aws-py38_4 : SKIPPED
ansible-test-cloud-integration-aws-py38_5 : SKIPPED

jillr · 2022-01-21T21:58:16Z

recheck

softwarefactory-project-zuul · 2022-01-21T22:36:56Z

Build failed.

ansible-galaxy-importer : SUCCESS in 6m 37s
build-ansible-collection : SUCCESS in 6m 16s
ansible-test-sanity-aws-ansible-python38 : SUCCESS in 11m 08s
ansible-test-sanity-aws-ansible-2.9-python38 : FAILURE in 17m 58s
ansible-test-sanity-aws-ansible-2.11-python38 : SUCCESS in 13m 37s
ansible-test-units-amazon-aws-python38 : SUCCESS in 13m 28s
ansible-test-splitter : SUCCESS in 2m 52s
ansible-test-cloud-integration-aws-py38_0 : SUCCESS in 30m 40s
ansible-test-cloud-integration-aws-py38_1 : SKIPPED
ansible-test-cloud-integration-aws-py38_2 : SKIPPED
ansible-test-cloud-integration-aws-py38_3 : SKIPPED
ansible-test-cloud-integration-aws-py38_4 : SKIPPED
ansible-test-cloud-integration-aws-py38_5 : SKIPPED

jillr · 2022-01-24T23:47:47Z

@mandar242 you can add the gate label to this PR when the sanity/ignores-2.9.txt file is updated and the tests are passing

softwarefactory-project-zuul · 2022-01-25T01:11:04Z

Build failed.

ansible-galaxy-importer : SUCCESS in 7m 55s
build-ansible-collection : SUCCESS in 9m 17s
ansible-test-sanity-aws-ansible-python38 : SUCCESS in 12m 45s
ansible-test-sanity-aws-ansible-2.9-python38 : SUCCESS in 16m 58s
ansible-test-sanity-aws-ansible-2.11-python38 : SUCCESS in 15m 32s
ansible-test-units-amazon-aws-python38 : SUCCESS in 11m 14s
ansible-test-splitter : SUCCESS in 5m 30s
ansible-test-cloud-integration-aws-py38_0 : TIMED_OUT in 1h 01m 52s
ansible-test-cloud-integration-aws-py38_1 : SKIPPED
ansible-test-cloud-integration-aws-py38_2 : SKIPPED
ansible-test-cloud-integration-aws-py38_3 : SKIPPED
ansible-test-cloud-integration-aws-py38_4 : SKIPPED
ansible-test-cloud-integration-aws-py38_5 : SKIPPED

alinabuzachis · 2022-01-25T12:10:30Z

recheck

softwarefactory-project-zuul · 2022-01-25T13:13:16Z

Build succeeded.

ansible-galaxy-importer : SUCCESS in 5m 42s
build-ansible-collection : SUCCESS in 8m 52s
ansible-test-sanity-aws-ansible-python38 : SUCCESS in 12m 21s
ansible-test-sanity-aws-ansible-2.9-python38 : SUCCESS in 17m 33s
ansible-test-sanity-aws-ansible-2.11-python38 : SUCCESS in 12m 42s
ansible-test-units-amazon-aws-python38 : SUCCESS in 14m 50s
ansible-test-splitter : SUCCESS in 6m 06s
ansible-test-cloud-integration-aws-py38_0 : SUCCESS in 50m 22s
ansible-test-cloud-integration-aws-py38_1 : SKIPPED
ansible-test-cloud-integration-aws-py38_2 : SKIPPED
ansible-test-cloud-integration-aws-py38_3 : SKIPPED
ansible-test-cloud-integration-aws-py38_4 : SKIPPED
ansible-test-cloud-integration-aws-py38_5 : SKIPPED

ansible-zuul

LGTM!

Update README, CONTRIBUTING.md: freenode -> libera.chat Reviewed-by: Andrew Klychkov <[email protected]> https://github.com/Andersson007

mandar242 assigned mandar242 and unassigned mandar242 Dec 9, 2021

mandar242 requested review from tremble and jillr December 9, 2021 01:42

mandar242 changed the title ~~[WIP] ec2_instance: Fix launch template condition, handle launch template - default value for instance_type~~ ec2_instance: Fix launch template condition, handle launch template - default value for instance_type Dec 16, 2021

jillr reviewed Dec 17, 2021

View reviewed changes

plugins/modules/ec2_instance.py Show resolved Hide resolved

markuman reviewed Dec 17, 2021

View reviewed changes

Handle launch template, default value for instance_type.

65a73e5

mandar242 force-pushed the 451_launch_template branch 2 times, most recently from 5465923 to 70f5ad8 Compare December 17, 2021 16:54

Add deprecation warning for instance type default value

449d959

mandar242 force-pushed the 451_launch_template branch from 70f5ad8 to 449d959 Compare December 17, 2021 17:03

mandar242 requested review from markuman and jillr December 17, 2021 17:03

mandar242 mentioned this pull request Dec 26, 2021

ec2_instance keeps default value even if set in launch template #462

Closed

emanuele-leopardi approved these changes Dec 26, 2021

View reviewed changes

jillr reviewed Jan 4, 2022

View reviewed changes

changelogs/fragments/587-ec2_instance-default-instance-type-launch-template.yml Show resolved Hide resolved

Changelogs: add deprecation note for default value

e6b5660

mandar242 requested a review from jillr January 4, 2022 17:52

jillr approved these changes Jan 4, 2022

View reviewed changes

alinabuzachis approved these changes Jan 7, 2022

View reviewed changes

Add entry in the ignore file for deprecation dates for 2.9

9bfbfa0

mandar242 added the gate label Jan 25, 2022

ansible-zuul bot approved these changes Jan 25, 2022

View reviewed changes

alinabuzachis added gate and removed gate labels Jan 25, 2022

ansible-zuul bot merged commit 9a5a1eb into ansible-collections:main Jan 25, 2022

mandar242 deleted the 451_launch_template branch January 25, 2022 21:48

renovate bot mentioned this pull request Sep 18, 2022

Update dependency amazon.aws to v4 - autoclosed platan/metrics-shields-io-config#104

Closed

1 task

renovate bot mentioned this pull request Oct 4, 2022

Update dependency amazon.aws to v5 - autoclosed platan/metrics-shields-io-config#109

Closed

1 task

renovate bot mentioned this pull request Oct 27, 2022

Update dependency amazon.aws to v5 - autoclosed jkroepke/homelab#27

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ec2_instance: Fix launch template condition, handle launch template - default value for instance_type #587

ec2_instance: Fix launch template condition, handle launch template - default value for instance_type #587

mandar242 commented Dec 9, 2021 •

edited

Loading

mandar242 commented Dec 9, 2021

markuman left a comment

mandar242 commented Dec 20, 2021

emanuele-leopardi left a comment

alinabuzachis Jan 7, 2022

jillr Jan 12, 2022

jillr commented Jan 12, 2022

softwarefactory-project-zuul bot commented Jan 12, 2022

jillr commented Jan 21, 2022

softwarefactory-project-zuul bot commented Jan 21, 2022

jillr commented Jan 24, 2022

softwarefactory-project-zuul bot commented Jan 25, 2022

alinabuzachis commented Jan 25, 2022

softwarefactory-project-zuul bot commented Jan 25, 2022

ansible-zuul bot left a comment

ec2_instance: Fix launch template condition, handle launch template - default value for instance_type #587

ec2_instance: Fix launch template condition, handle launch template - default value for instance_type #587

Conversation

mandar242 commented Dec 9, 2021 • edited Loading

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

mandar242 commented Dec 9, 2021

markuman left a comment

Choose a reason for hiding this comment

mandar242 commented Dec 20, 2021

emanuele-leopardi left a comment

Choose a reason for hiding this comment

alinabuzachis Jan 7, 2022

Choose a reason for hiding this comment

jillr Jan 12, 2022

Choose a reason for hiding this comment

jillr commented Jan 12, 2022

softwarefactory-project-zuul bot commented Jan 12, 2022

jillr commented Jan 21, 2022

softwarefactory-project-zuul bot commented Jan 21, 2022

jillr commented Jan 24, 2022

softwarefactory-project-zuul bot commented Jan 25, 2022

alinabuzachis commented Jan 25, 2022

softwarefactory-project-zuul bot commented Jan 25, 2022

ansible-zuul bot left a comment

Choose a reason for hiding this comment

mandar242 commented Dec 9, 2021 •

edited

Loading