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

Fix incorrect command-line parameters for Solaris #22865

Merged
merged 2 commits into from Aug 24, 2017

Conversation

AlexZolotarenko
Copy link
Contributor

SUMMARY

Solaris 'mount' command does not have flag to point to fstab file.
So no such flags should be passed to the command.
Fixes #22135

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

mount module

ANSIBLE VERSION
ansible 2.2.1.0 and later 

ADDITIONAL INFORMATION

@ansibot ansibot added affects_2.4 This issue/PR affects Ansible v2.4 bugfix_pull_request core_review In order to be merged, this PR must follow the core review workflow. module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. labels Mar 22, 2017
@Qalthos Qalthos removed the needs_triage Needs a first human triage before being processed. label Mar 23, 2017
@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 the support:core This issue/PR relates to code supported by the Ansible Engineering Team. label Jun 29, 2017
@calfonso
Copy link
Contributor

cc @jtyr would you mind reviewing this?

Copy link
Contributor

@jtyr jtyr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the requested change is in place I fine it to be merged. Unfortunately I cannot verify whether Solaris doesn't really need this option. I guess we must trust the usere here.

@@ -327,7 +327,7 @@ def unset_mount(module, args):
def _set_fstab_args(fstab_file):
result = []

if fstab_file and fstab_file != '/etc/fstab':
if fstab_file and fstab_file != '/etc/fstab' and get_platform().lower() != 'sunos':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please could you change it to:

    if (
            fstab_file and
            fstab_file != '/etc/fstab' and
            get_platform().lower() != 'sunos'):

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I did it correct, but it's updated according your request.

Copy link
Contributor

@jtyr jtyr Aug 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks good!

@ansibot ansibot added 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 Aug 17, 2017
@bcoca
Copy link
Member

bcoca commented Aug 18, 2017

rebuild_merge

@ansibot ansibot removed 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 Aug 24, 2017
@calfonso
Copy link
Contributor

@jtyr Any other changes requested from you?

@jtyr
Copy link
Contributor

jtyr commented Aug 24, 2017

Nop. I think if that works for you on Solaris then we can merge it now. @bcoca can you take care of it?

@bcoca bcoca removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. label Aug 24, 2017
@bcoca bcoca merged commit 69bf533 into ansible:devel Aug 24, 2017
prasadkatti pushed a commit to prasadkatti/ansible that referenced this pull request Oct 1, 2017
* Fix incorrect command-line parameters for Solaris

* Update mount.py
@ansibot ansibot added bug This issue/PR relates to a bug. and removed bugfix_pull_request labels Mar 6, 2018
@dagwieers dagwieers added the solaris Solaris community label Jan 9, 2019
@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.4 This issue/PR affects Ansible v2.4 bug This issue/PR relates to a bug. module This issue/PR relates to a module. solaris Solaris community 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.

Mount module: incorrect command-line arguments used for Solaris.
7 participants