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

Prefer ansible.builtin.include_role to a roles block #226

Merged
merged 5 commits into from
May 22, 2023
Merged

Prefer ansible.builtin.include_role to a roles block #226

merged 5 commits into from
May 22, 2023

Conversation

jsf9k
Copy link
Member

@jsf9k jsf9k commented Feb 27, 2023 •
edited
Loading

🗣 Description

This pull request:

  • Modifies the Ansible code to prefer ansible.builtin.include_role to a roles block in playbooks and playbook fragments
  • Alphabetizes the attributes for each entry in src/requirements.txt

💭 Motivation and context

Resolves #198.

🧪 Testing

All automated tests pass.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All new and existing tests pass.

✅ Pre-merge checklist

  • Finalize version.

✅ Post-merge checklist

  • Create a release.

@jsf9k
Prefer ansible.builtin.include_role to a roles block
9993a8c 
The former is more flexible, as described in #198.
@jsf9k jsf9k added improvement This issue or pull request will add or improve functionality, maintainability, or ease of use kraken 🐙 This pull request is ready to merge during the next Lineage Kraken release labels Feb 27, 2023
@jsf9k jsf9k marked this pull request as ready for review February 27, 2023 16:09
dav3r
dav3r approved these changes Feb 27, 2023
View reviewed changes
Copy link
Member

@dav3r dav3r left a comment

Choose a reason for hiding this comment

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

👍 👍

mcdonnnj
mcdonnnj reviewed Feb 27, 2023
View reviewed changes
Copy link
Member

@mcdonnnj mcdonnnj left a comment

Choose a reason for hiding this comment

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

I like the direction this PR is taking us but I have a request and a question for your consideration.

src/example.yml Outdated Show resolved Hide resolved
src/python.yml Outdated Show resolved Hide resolved
@jsf9k jsf9k requested a review from a team February 27, 2023 18:03
jsf9k and others added 3 commits February 27, 2023 13:13
@jsf9k @mcdonnnj
Fix misleading task name
ff2984a 
Co-authored-by: Nicholas McDonnell <[email protected]>
@jsf9k @mcdonnnj
Install Python before pip
2c1b7a1 
If pip is installed first, then the OS _could_ pull different Python
packages than what would be installed via the
cisagov/ansible-role-python role; hence, the new ordering is more
controlled.

Co-authored-by: Nicholas McDonnell <[email protected]>
@jsf9k @dav3r
Add a comment explaining why Python is installed before pip
45ea09c 
Co-authored-by: dav3r <[email protected]>
@jsf9k jsf9k requested a review from mcdonnnj February 27, 2023 18:42
@jmorrowomni jmorrowomni added this pull request to the merge queue May 21, 2023
@jmorrowomni jmorrowomni removed this pull request from the merge queue due to a manual request May 21, 2023
@jmorrowomni jmorrowomni added this pull request to the merge queue May 21, 2023
@jmorrowomni jmorrowomni removed this pull request from the merge queue due to a manual request May 22, 2023
@mcdonnnj mcdonnnj added this pull request to the merge queue May 22, 2023
Merged via the queue into develop with commit cd3a3bf May 22, 2023
@mcdonnnj mcdonnnj deleted the improvement/prefer-include-role-to-roles-block branch May 22, 2023 03:25
@mcdonnnj mcdonnnj mentioned this pull request Jun 5, 2023
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dav3r dav3r dav3r approved these changes

@mcdonnnj mcdonnnj mcdonnnj approved these changes

@felddy felddy Awaiting requested review from felddy felddy is a code owner

Assignees

@jsf9k jsf9k

@mcdonnnj mcdonnnj

Labels
improvement This issue or pull request will add or improve functionality, maintainability, or ease of use kraken 🐙 This pull request is ready to merge during the next Lineage Kraken release
Projects
Next Kraken
Status: Done
Skeleton Maintenance
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Consider preferring include_role to using a roles block in Ansible playbooks
3 participants
@jsf9k @dav3r @mcdonnnj