-
Notifications
You must be signed in to change notification settings - Fork 342
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
Migrate ec2 instance modules #354
Migrate ec2 instance modules #354
Conversation
recheck |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple of nits. I also don't see an update to the module_defaults.
If at all possible I would rather see this land including the history. To me the history is extremely valuable and I have missed on multiple occasions having the original ansible/ansible history available to me (without making multiple queries)
906cbe3
to
32cc313
Compare
209feca
to
dbdf374
Compare
@goneri Looks like the tests didn't trigger again |
tests/integration/targets/ec2_instance/roles/ec2_instance/meta/main.yml
Outdated
Show resolved
Hide resolved
@@ -0,0 +1,5 @@ | |||
dependencies: | |||
- prepare_tests |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
prepare_tests
includes an empty file. Why do we need it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TBH that's been migrated around as-is since it was in ansible/ansible. It would probably we good to do a general review but I'd prefer not to make too many changes here beyond what's needed to get the modules working
dbdf374
to
18679c7
Compare
I"m going to try a cli merge. If anything goes wrong (ie, history is squashed) we can revert. (after a fresh rebase onto main) |
18679c7
to
b43e12e
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (the integration tests that are skipped).
The git cli won't actually work for this, it wants to either squash or merge. After discussing with @gravesm and @goneri our options here are:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FWIW I'd probably go with option 3:
- Keeps the history
- Results in a single additional commit with the things specifically related to the migration.
Patched the files from community onto main (eek!) will cleanup the conflicts here and see how it goes |
Moves ec2_instance and ec2_instance_info from community.aws to amazon.aws via git patch.
b43e12e
to
2f15959
Compare
SUMMARY
Moves ec2_instance and ec2_instance_info from community.aws to amazon.aws via git patch.
ISSUE TYPE
COMPONENT NAME
ec2_instance
ec2_instance_info
ADDITIONAL INFORMATION
This is the first time we're doing this, git history should be preserved but Github may want to squash. I don't love the idea of directly committing to origin to get around that. ETA: I should be able to do a manual merge from the cli though?
Migration was done via:
then adding the _facts.py symlink and sed'ing the FQCNs.
A PR will follow to remove the modules from community.aws after this has merged.