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

contrib(inventory): fix Scaleway inventory used w/env variable token #35701

Merged
merged 1 commit into from Feb 5, 2018

Conversation

paulRbr
Copy link
Contributor

@paulRbr paulRbr commented Feb 4, 2018

SUMMARY

In order to authenticate with the Scaleway API for the contrib dynamic
inventory Scaleway the environment variable SCALEWAY_TOKEN was read
only if a value was set in the configuration .ini file.

This PR fixes that allowing to read only the environment variable
without needing to set a token in the configuration file.

Fixes #35693

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

contrib/inventory/scaleway

In order to authenticate with the Scaleway API for the contrib dynamic
inventory Scaleway the environment variable SCALEWAY_TOKEN was read
only if a value was set in the configuration .ini file.

This PR fixes that allowing to read only the environment variable
without needing to set a token in the configuration file.

Closes ansible#35693
@paulRbr
Copy link
Contributor Author

paulRbr commented Feb 4, 2018

ready_for_review

cc @nerzhul @harobed

@ansibot ansibot added bugfix_pull_request c:inventory/contrib_script inventory Inventory category needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. labels Feb 4, 2018
@nerzhul
Copy link
Contributor

nerzhul commented Feb 5, 2018

shipit

@gundalow gundalow merged commit ccdc93a into ansible:devel Feb 5, 2018
@gundalow
Copy link
Contributor

gundalow commented Feb 5, 2018

Merged into devel fix will be released in Ansible 2.5.0.

@paulRbr
Copy link
Contributor Author

paulRbr commented Feb 5, 2018

Thanks both of you

@paulRbr paulRbr deleted the contrib-inventory-scaleway-fix branch February 5, 2018 08:56
@bcoca bcoca removed the needs_triage Needs a first human triage before being processed. label Feb 6, 2018
@ansibot ansibot added bug This issue/PR relates to a bug. and removed bugfix_pull_request labels Mar 6, 2018
@ansible ansible locked and limited conversation to collaborators Apr 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug This issue/PR relates to a bug. c:inventory/contrib_script inventory Inventory category support:community This issue/PR relates to code supported by the Ansible community.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

contrib/inventory/scaleway.py inventory script fail if auth.api_token missing in ini conf file
5 participants