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.

Sign up for GitHub

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

Jump to bottom

dont specify default for port, allow ssh/config #74526

Merged
merged 8 commits into from
May 4, 2021
Merged

dont specify default for port, allow ssh/config #74526

merged 8 commits into from
May 4, 2021

Conversation

bcoca
Copy link
Member

@bcoca bcoca commented Apr 30, 2021

also added general note on how defaults work.
fixes #74524

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

connection/ssh

@ansibot ansibot added affects_2.12 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. docs_only All changes are to files within the docs/docsite/ directory needs_triage Needs a first human triage before being processed. small_patch support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Apr 30, 2021
@bcoca @Akasurde
dont specify default for port, allow ssh/config
1f8dd2c 
 also added general note on how defaults work.

Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
@bcoca bcoca force-pushed the ssh_default_not_our_default branch from b2c06ae to 1f8dd2c Compare May 3, 2021 13:20
@ansibot ansibot removed docs_only All changes are to files within the docs/docsite/ directory small_patch labels May 3, 2021
bcoca and others added 3 commits May 3, 2021 17:19
@bcoca @samdoran
Update changelogs/fragments/ssh_porr_default.fix.yml
c29ed27 
Co-authored-by: Sam Doran <sdoran@redhat.com>
@bcoca @samdoran
Update lib/ansible/plugins/connection/ssh.py
9b1ef05 
Co-authored-by: Sam Doran <sdoran@redhat.com>
@bcoca
actually test it
3542464
@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. support:community This issue/PR relates to code supported by the Ansible community. and removed core_review In order to be merged, this PR must follow the core review workflow. labels May 3, 2021
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. 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. core_review In order to be merged, this PR must follow the core review workflow. labels May 3, 2021
@yan12125
Copy link
Contributor

yan12125 commented May 4, 2021

Thanks a lot for the fix! Could you also fix the changelog filename?

-ssh_porr_default.fix.yml
+ssh_port_default.fix.yml

@samdoran samdoran added the ci_verified Changes made in this PR are causing tests to fail. label May 4, 2021
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed ci_verified Changes made in this PR are causing tests to fail. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels May 4, 2021
@ansibot
Copy link
Contributor

ansibot commented May 4, 2021

The test ansible-test sanity --test package-data [explain] failed with 1 error:

ssh_port_default_fix.yml:0:0: File was not added to sdist

click here for bot help

@ansibot ansibot added ci_verified Changes made in this PR are causing tests to fail. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels May 4, 2021
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed ci_verified Changes made in this PR are causing tests to fail. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels May 4, 2021
@bcoca bcoca merged commit 30912b6 into ansible:devel May 4, 2021
@bcoca bcoca deleted the ssh_default_not_our_default branch May 4, 2021 15:09
bcoca added a commit to bcoca/ansible that referenced this pull request May 4, 2021
@bcoca
dont specify default for port, allow ssh/config (ansible#74526)
a342309 
* dont specify default for port, allow ssh/config

 also added general note on how defaults work.

Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
Co-authored-by: Sam Doran <sdoran@redhat.com>
(cherry picked from commit 30912b6)
@mkrizek mkrizek removed the needs_triage Needs a first human triage before being processed. label May 4, 2021
relrod pushed a commit that referenced this pull request May 17, 2021
@bcoca
dont specify default for port, allow ssh/config (#74526) (#74562)
45618a6 
 also added general note on how defaults work.

Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
Co-authored-by: Sam Doran <sdoran@redhat.com>
(cherry picked from commit 30912b6)
@ansible ansible locked and limited conversation to collaborators Jun 1, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Akasurde Akasurde Akasurde left review comments

@samdoran samdoran samdoran left review comments

@sivel sivel sivel approved these changes

Assignees
No one assigned
Labels
affects_2.12 bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Ignoring ~/.ssh/config configuration file
7 participants
@bcoca @yan12125 @ansibot @sivel @Akasurde @samdoran @mkrizek