Simplify gce inventory plugin injector #3754
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Build failed.
|
AlanCoding
commented
Apr 23, 2019
| @@ -18,8 +18,6 @@ def gce(cred, env, private_data_dir): | |||
| project = cred.get_input('project', default='') | |||
| username = cred.get_input('username', default='') | |||
|
|
|||
| env['GCE_EMAIL'] = username | |||
| env['GCE_PROJECT'] = project | |||
There was a problem hiding this comment.
See https://docs.ansible.com/ansible/latest/modules/gce_module.html
I can find no evidence that these are employed by the gce module anywhere, and if not, they shouldn't be here.
There was a problem hiding this comment.
b) GCE_PROJECT, GCE_CREDENTIAL_FILE_PATH, GCE_EMAIL (legacy, not recommended; req'd if using p12 key)
Maybe I'm wrong about this and GCE_EMAIL is still needed...
This consumes the change made in Ansible core ansible/ansible#54407 which is in Ansible 2.8, allowing the plugin injection logic to share the script logic and to be simplified
|
Build succeeded.
|
ryanpetrello
approved these changes
Apr 23, 2019
|
Build succeeded.
|
|
Build succeeded (gate pipeline).
|
shanemcd
pushed a commit
to shanemcd/awx
that referenced
this pull request
Sep 13, 2019
Upload directly 353
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
This consumes the change made in Ansible core:
ansible/ansible#54407
Which is in Ansible 2.8
This allows the plugin injection logic to share the script logic.
ISSUE TYPE
COMPONENT NAME
AWX VERSION
ADDITIONAL INFORMATION
This entry becomes congruent with the script environment now, see:
awx/awx/main/tests/data/inventory/scripts/gce/env.json
Line 4 in 864fef4
This is a very subtle change which will keep open many important possibilities if #3749 also makes it in.
build_envmethods access to the credential file paths