Skip to content
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.

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

Update the ec2.py inventory script to set ansible_host as well as ansible_ssh_host #17113

Merged
merged 1 commit into from Jul 17, 2017

Conversation

jbscare
Copy link
Contributor

@jbscare jbscare commented Aug 17, 2016

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

contrib/inventory/ec2.py

ANSIBLE VERSION
ansible 2.2.0 (inventory-ec2-py-ansible-host 118d7957b4) last updated 2016/08/16 21:17:54 (GMT -400)
  lib/ansible/modules/core:  not found - use git submodule update --init lib/ansible/modules/core
  lib/ansible/modules/extras:  not found - use git submodule update --init lib/ansible/modules/extras
  config file = 
  configured module search path = Default w/o overrides
SUMMARY

contrib/inventory/ec2.py sets ansible_ssh_host, but http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups says

Ansible 2.0 has deprecated the "ssh" from ansible_ssh_user, ansible_ssh_host, and ansible_ssh_port to become ansible_user, ansible_host, and ansible_port.

Since the ansible_ssh_* variables aren't removed, just deprecated, this commit simply adds ansible_host to the variables set by ec2.py.

May address some (but probably not all) of #15286.

@nitzmahone
Copy link
Member

@jlaska can you think of any issues this would cause on the Tower side?

@ansibot ansibot added affects_2.3 This issue/PR affects Ansible v2.3 bugfix_pullrequest aws cloud labels Dec 13, 2016
@ansibot ansibot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Dec 16, 2016
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jan 2, 2017
@ansibot
Copy link
Contributor

ansibot commented Feb 14, 2017

@willthames
Copy link
Contributor

At this point in time I wonder if we should just replace ansible_ssh_host with ansible_host rather than add it alongside.

@jbscare
Copy link
Contributor Author

jbscare commented Mar 29, 2017

@willthames : Sure, I've updated the PR to reflect that.

@ansibot ansibot added the stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. label Apr 11, 2017
@ansibot ansibot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Jun 24, 2017
@s-hertel
Copy link
Contributor

@jbscare I can't push commits to your branch to rebase this. Would you mind doing so? This looks good to me.

@ansibot ansibot added the inventory Inventory category label Jul 17, 2017
@jbscare jbscare force-pushed the inventory-ec2-py-ansible-host branch from 224afd8 to f68506e Compare July 17, 2017 14:52
@jbscare
Copy link
Contributor Author

jbscare commented Jul 17, 2017

Sure thing; done!

@ansibot ansibot removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html stale_ci This PR has been tested by CI more than one week ago. Close and re-open this PR to get it retested. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jul 17, 2017
@ryansb ryansb merged commit 290d84f into ansible:devel Jul 17, 2017
@ansibot ansibot added feature This issue/PR relates to a feature request. bug This issue/PR relates to a bug. and removed feature_pull_request labels Mar 4, 2018
@ansible ansible locked and limited conversation to collaborators Apr 26, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.3 This issue/PR affects Ansible v2.3 aws bug This issue/PR relates to a bug. c:inventory/contrib_script cloud feature This issue/PR relates to a feature request. inventory Inventory category support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants