aws_ec2 fix hostnames #862

alinabuzachis · 2022-06-03T12:01:26Z

SUMMARY

aws_ec2- fix hostnames bugs

Should fix #582 and #583

Fix returned hosts when

hostnames:
- tag:Tag1,Tag2

Fix returned hosts when

hostnames:
- tag:Tag1
- tag:Tag2

Fix returned hosts when

hostnames:
- tag:Tag1=Test1,Tag2=Test2

Given and EC2 instance with the following tags

tags:
  Tag1: Test1
  Tag2: Test2

Instead of only returning

"aws_ec2": {
    "hosts": [
        "Test1"
    ]
},
"tag_Name_instance_02": {
    "hosts": [
        "Test1"
    ]
},
"tag_Tag1_Test1": {
    "hosts": [
        "Test1"
    ]
},
"tag_Tag2_Test2": {
    "hosts": [
        "Test1"
    ]
}

It returns now

{
"_meta": {
   "hostvars": {
         "Test1": {
                "ami_launch_index": 0,
                "ansible_host": "10.210.0.101",
                   ...},
         "Test2": {
                 "ami_launch_index": 0,
                 "ansible_host": "10.210.0.101",
                   ...},
    },
    "all": {
        "children": [
            "aws_ec2",
            "tag_Name_instance_02",
            "tag_Tag1_Test1",
            "tag_Tag2_Test2",
            "ungrouped"
        ]
    },
    "aws_ec2": {
        "hosts": [
            "Test1",
            "Test2"
        ]
    },
    "tag_Name_instance_02": {
        "hosts": [
            "Test1",
            "Test2"
        ]
    },
    "tag_Tag1_Test1": {
        "hosts": [
            "Test1",
            "Test2"
        ]
    },
    "tag_Tag2_Test2": {
        "hosts": [
            "Test1",
            "Test2"
        ]
    }
}

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME

aws_ec2

ADDITIONAL INFORMATION

Signed-off-by: Alina Buzachis <[email protected]>

softwarefactory-project-zuul · 2022-06-03T13:28:40Z

Build failed.

Signed-off-by: Alina Buzachis <[email protected]>

softwarefactory-project-zuul · 2022-06-03T15:13:54Z

Build succeeded.

Signed-off-by: Alina Buzachis <[email protected]>

softwarefactory-project-zuul · 2022-06-03T16:41:44Z

Build failed.

alinabuzachis · 2022-06-03T16:49:04Z

recheck

softwarefactory-project-zuul · 2022-06-03T17:44:04Z

Build succeeded.

tremble · 2022-06-13T08:02:32Z

tests/integration/targets/inventory_aws_ec2/templates/inventory_with_hostnames.yml.j2

+# can also be specified using
+# - tag:Tag1,Tag2
+# or
+# - tag:Tag1=Test1,Tag2=Test2


If possible I'd like to see an integration test of at least one of these.
"tag:Tag1,Tag2" wouldn't be the 'usual' way to write tags in a filter (see #582), so if that leaked into a filter it's more likely to break things than "tag:Tag1,tag:Tag2" appearing in a filter.

Added the integration tests for - tag:Tag1=Test1,Tag2=Test2.

softwarefactory-project-zuul · 2022-06-22T12:27:55Z

Build failed.

Signed-off-by: Alina Buzachis <[email protected]>

softwarefactory-project-zuul · 2022-06-22T15:06:42Z

Build succeeded.

softwarefactory-project-zuul · 2022-06-24T10:39:09Z

Build succeeded (gate pipeline).

github-actions · 2022-06-24T10:41:24Z

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

patchback · 2022-06-24T19:27:22Z

Backport to stable-4: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-4/ca33389025293863a0884a0a0295bb4cfd46688c/pr-862

Backported as #899

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

aws_ec2 fix hostnames SUMMARY aws_ec2- fix hostnames bugs Should fix #582 and #583 Fix returned hosts when hostnames: - tag:Tag1,Tag2 Fix returned hosts when hostnames: - tag:Tag1 - tag:Tag2 Fix returned hosts when hostnames: - tag:Tag1=Test1,Tag2=Test2 Given and EC2 instance with the following tags tags: Tag1: Test1 Tag2: Test2 Instead of only returning "aws_ec2": { "hosts": [ "Test1" ] }, "tag_Name_instance_02": { "hosts": [ "Test1" ] }, "tag_Tag1_Test1": { "hosts": [ "Test1" ] }, "tag_Tag2_Test2": { "hosts": [ "Test1" ] } It returns now { "_meta": { "hostvars": { "Test1": { "ami_launch_index": 0, "ansible_host": "10.210.0.101", ...}, "Test2": { "ami_launch_index": 0, "ansible_host": "10.210.0.101", ...}, }, "all": { "children": [ "aws_ec2", "tag_Name_instance_02", "tag_Tag1_Test1", "tag_Tag2_Test2", "ungrouped" ] }, "aws_ec2": { "hosts": [ "Test1", "Test2" ] }, "tag_Name_instance_02": { "hosts": [ "Test1", "Test2" ] }, "tag_Tag1_Test1": { "hosts": [ "Test1", "Test2" ] }, "tag_Tag2_Test2": { "hosts": [ "Test1", "Test2" ] } } ISSUE TYPE Bugfix Pull Request COMPONENT NAME aws_ec2 ADDITIONAL INFORMATION Reviewed-by: Mark Chappell <None> Reviewed-by: Alina Buzachis <None> Reviewed-by: Markus Bergholz <[email protected]> (cherry picked from commit ca33389)

[PR #862/ca333890 backport][stable-4] aws_ec2 fix hostnames This is a backport of PR #862 as merged into main (ca33389). SUMMARY aws_ec2- fix hostnames bugs Should fix #582 and #583 Fix returned hosts when hostnames: - tag:Tag1,Tag2 Fix returned hosts when hostnames: - tag:Tag1 - tag:Tag2 Fix returned hosts when hostnames: - tag:Tag1=Test1,Tag2=Test2 Given and EC2 instance with the following tags tags: Tag1: Test1 Tag2: Test2 Instead of only returning "aws_ec2": { "hosts": [ "Test1" ] }, "tag_Name_instance_02": { "hosts": [ "Test1" ] }, "tag_Tag1_Test1": { "hosts": [ "Test1" ] }, "tag_Tag2_Test2": { "hosts": [ "Test1" ] } It returns now { "_meta": { "hostvars": { "Test1": { "ami_launch_index": 0, "ansible_host": "10.210.0.101", ...}, "Test2": { "ami_launch_index": 0, "ansible_host": "10.210.0.101", ...}, }, "all": { "children": [ "aws_ec2", "tag_Name_instance_02", "tag_Tag1_Test1", "tag_Tag2_Test2", "ungrouped" ] }, "aws_ec2": { "hosts": [ "Test1", "Test2" ] }, "tag_Name_instance_02": { "hosts": [ "Test1", "Test2" ] }, "tag_Tag1_Test1": { "hosts": [ "Test1", "Test2" ] }, "tag_Tag2_Test2": { "hosts": [ "Test1", "Test2" ] } } ISSUE TYPE Bugfix Pull Request COMPONENT NAME aws_ec2 ADDITIONAL INFORMATION Reviewed-by: Mark Chappell <None>

aws_ec2 fix hostnames SUMMARY aws_ec2- fix hostnames bugs Should fix ansible-collections#582 and ansible-collections#583 Fix returned hosts when hostnames: - tag:Tag1,Tag2 Fix returned hosts when hostnames: - tag:Tag1 - tag:Tag2 Fix returned hosts when hostnames: - tag:Tag1=Test1,Tag2=Test2 Given and EC2 instance with the following tags tags: Tag1: Test1 Tag2: Test2 Instead of only returning "aws_ec2": { "hosts": [ "Test1" ] }, "tag_Name_instance_02": { "hosts": [ "Test1" ] }, "tag_Tag1_Test1": { "hosts": [ "Test1" ] }, "tag_Tag2_Test2": { "hosts": [ "Test1" ] } It returns now { "_meta": { "hostvars": { "Test1": { "ami_launch_index": 0, "ansible_host": "10.210.0.101", ...}, "Test2": { "ami_launch_index": 0, "ansible_host": "10.210.0.101", ...}, }, "all": { "children": [ "aws_ec2", "tag_Name_instance_02", "tag_Tag1_Test1", "tag_Tag2_Test2", "ungrouped" ] }, "aws_ec2": { "hosts": [ "Test1", "Test2" ] }, "tag_Name_instance_02": { "hosts": [ "Test1", "Test2" ] }, "tag_Tag1_Test1": { "hosts": [ "Test1", "Test2" ] }, "tag_Tag2_Test2": { "hosts": [ "Test1", "Test2" ] } } ISSUE TYPE Bugfix Pull Request COMPONENT NAME aws_ec2 ADDITIONAL INFORMATION Reviewed-by: Mark Chappell <None> Reviewed-by: Alina Buzachis <None> Reviewed-by: Markus Bergholz <[email protected]>

flowerysong · 2022-08-16T19:34:53Z

This is a massively breaking change, not a bugfix. hostnames was designed as an ordered list of hostname candidates, with the first working one used. Switching to using all working candidates results in the same host being added to the inventory multiple times (#950), which is not what most people want.

I can see why someone might want the new behaviour, but it should default to off.

With this change:

    "az_us_east_2b": {
        "hosts": [
            "ec2-18-221-212-154.us-east-2.compute.amazonaws.com",
            "ec2-3-14-67-171.us-east-2.compute.amazonaws.com",
            "ip-10-0-81-209.us-east-2.compute.internal",
            "ip-10-0-81-33.us-east-2.compute.internal",
            "set-byakhee.jail.x.mail.umich.edu",
            "unimpeded-nunobiki.mx.x.mail.umich.edu"
        ]
    },

After reverting to the previous working version:

    "az_us_east_2b": {
        "hosts": [
            "set-byakhee.jail.x.mail.umich.edu",
            "unimpeded-nunobiki.mx.x.mail.umich.edu"
        ]
    },

yamjoepobuda · 2022-08-31T20:31:56Z

This is a massively breaking change, not a bugfix.

We had a number of systems break due to this change. We rely on host_vars being a static value. This introduced literal chaos and caused a number of hosts to fallback to role defaults.

markuman · 2022-09-01T05:28:20Z

Maybe a new parameter unique_hostnames with default(true) must be introduced, that brings the old behaviour back.
What do you think @alinabuzachis?

alinabuzachis · 2022-09-01T09:08:45Z

Maybe a new parameter unique_hostnames with default(true) must be introduced, that brings the old behaviour back.
What do you think @alinabuzachis?

Yes, we can also do that. @tremble what do you think instead?

tremble · 2022-09-01T09:16:15Z

I'd head in that direction

Might it also be worth exposing "hostname_" groups so that all of the hostnames can be accessed?

goneri · 2022-09-15T19:50:53Z

For the record, I'm working on a fix for this, cf #950

-> #1026

Fix hostname

d915b86

Signed-off-by: Alina Buzachis <[email protected]>

ansibullbot added bug This issue/PR relates to a bug community_review integration tests/integration inventory inventory plugin needs_triage plugins plugin (any type) tests tests labels Jun 3, 2022

alinabuzachis force-pushed the aws_ec2/fix_hostnames branch from ac153ec to 0ba6958 Compare June 3, 2022 12:45

alinabuzachis force-pushed the aws_ec2/fix_hostnames branch 2 times, most recently from 5ba0047 to 90fc36c Compare June 3, 2022 14:01

alinabuzachis changed the title ~~aws_ec2 fix hostnames~~ [WIP] aws_ec2 fix hostnames Jun 3, 2022

ansibullbot added the WIP Work in progress label Jun 3, 2022

alinabuzachis force-pushed the aws_ec2/fix_hostnames branch from 90fc36c to 49bba77 Compare June 3, 2022 14:20

aws_ec2 - fix when hostnames bugs

0ff5348

Signed-off-by: Alina Buzachis <[email protected]>

alinabuzachis force-pushed the aws_ec2/fix_hostnames branch from 49bba77 to 0ff5348 Compare June 3, 2022 14:22

alinabuzachis changed the title ~~[WIP] aws_ec2 fix hostnames~~ aws_ec2 fix hostnames Jun 3, 2022

Add changelog fragment

b04f4e0

Signed-off-by: Alina Buzachis <[email protected]>

ansibullbot removed the WIP Work in progress label Jun 3, 2022

alinabuzachis mentioned this pull request Jun 7, 2022

aws_ec2.yml file hostnames example file doesn't work #582

Closed

1 task

alinabuzachis removed the needs_triage label Jun 7, 2022

ansibullbot added the has_issue label Jun 7, 2022

tremble reviewed Jun 13, 2022

View reviewed changes

alinabuzachis force-pushed the aws_ec2/fix_hostnames branch 2 times, most recently from af9d0fe to 0e40a4a Compare June 22, 2022 11:34

alinabuzachis force-pushed the aws_ec2/fix_hostnames branch from 85fcd49 to b696b03 Compare June 22, 2022 11:36

Add more integrations

0891fba

Signed-off-by: Alina Buzachis <[email protected]>

alinabuzachis force-pushed the aws_ec2/fix_hostnames branch from b696b03 to 0891fba Compare June 22, 2022 14:13

alinabuzachis requested a review from jillr June 22, 2022 17:00

tremble approved these changes Jun 22, 2022

View reviewed changes

alinabuzachis requested a review from markuman June 23, 2022 11:19

markuman approved these changes Jun 23, 2022

View reviewed changes

tremble added the mergeit Merge the PR (SoftwareFactory) label Jun 24, 2022

softwarefactory-project-zuul bot merged commit ca33389 into ansible-collections:main Jun 24, 2022

alinabuzachis mentioned this pull request Jun 24, 2022

aws_ec2 module only looks at first item in hostnames list #583

Closed

1 task

tremble added the backport-4 PR should be backported to the stable-4 branch label Jun 24, 2022

patchback bot mentioned this pull request Jun 24, 2022

[PR #862/ca333890 backport][stable-4] aws_ec2 fix hostnames #899

Merged

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

alinabuzachis mentioned this pull request Sep 28, 2022

inventory/aws_ec2: allow multi-entries for one host #1026

Merged

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

aws_ec2 fix hostnames #862

aws_ec2 fix hostnames #862

alinabuzachis commented Jun 3, 2022 •

edited

Loading

softwarefactory-project-zuul bot commented Jun 3, 2022

softwarefactory-project-zuul bot commented Jun 3, 2022

softwarefactory-project-zuul bot commented Jun 3, 2022

alinabuzachis commented Jun 3, 2022

softwarefactory-project-zuul bot commented Jun 3, 2022

tremble Jun 13, 2022

alinabuzachis Jun 22, 2022

softwarefactory-project-zuul bot commented Jun 22, 2022

softwarefactory-project-zuul bot commented Jun 22, 2022

softwarefactory-project-zuul bot commented Jun 24, 2022

github-actions bot commented Jun 24, 2022

patchback bot commented Jun 24, 2022 •

edited

Loading

flowerysong commented Aug 16, 2022 •

edited

Loading

yamjoepobuda commented Aug 31, 2022

markuman commented Sep 1, 2022

alinabuzachis commented Sep 1, 2022

tremble commented Sep 1, 2022

goneri commented Sep 15, 2022 •

edited

Loading

aws_ec2 fix hostnames #862

aws_ec2 fix hostnames #862

Conversation

alinabuzachis commented Jun 3, 2022 • edited Loading

SUMMARY

ISSUE TYPE

COMPONENT NAME

ADDITIONAL INFORMATION

softwarefactory-project-zuul bot commented Jun 3, 2022

softwarefactory-project-zuul bot commented Jun 3, 2022

softwarefactory-project-zuul bot commented Jun 3, 2022

alinabuzachis commented Jun 3, 2022

softwarefactory-project-zuul bot commented Jun 3, 2022

tremble Jun 13, 2022

Choose a reason for hiding this comment

alinabuzachis Jun 22, 2022

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Jun 22, 2022

softwarefactory-project-zuul bot commented Jun 22, 2022

softwarefactory-project-zuul bot commented Jun 24, 2022

github-actions bot commented Jun 24, 2022

Docs Build 📝

patchback bot commented Jun 24, 2022 • edited Loading

Backport to stable-4: 💚 backport PR created

flowerysong commented Aug 16, 2022 • edited Loading

yamjoepobuda commented Aug 31, 2022

markuman commented Sep 1, 2022

alinabuzachis commented Sep 1, 2022

tremble commented Sep 1, 2022

goneri commented Sep 15, 2022 • edited Loading

alinabuzachis commented Jun 3, 2022 •

edited

Loading

patchback bot commented Jun 24, 2022 •

edited

Loading

flowerysong commented Aug 16, 2022 •

edited

Loading

goneri commented Sep 15, 2022 •

edited

Loading