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

This is fix for #182 - Dependency problem in linux/system/selinux.sls. #185

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

This is fix for #182 - Dependency problem in linux/system/selinux.sls. #185

wants to merge 2 commits into from

Conversation

wasfree
Copy link
Contributor

@wasfree wasfree commented Nov 21, 2018

  • This change will remove dependecy from linux/system/repo.sls in linux/system/selinux.sls.
  • It also change structure from pillars selinux

old:
linux:
system:
...
selinux: permissive

new:
linux:
system:
...
selinux:
pkgs: ['policycoreutils', 'policycoreutils-python'],
mode: permissive

This is fix for salt-formulas#182 - Dependency problem in linux/syste…
9d259d4 
…m/selinux.sls.

- This change will remove dependecy from linux/system/repo.sls in linux/system/selinux.sls.
- It also change structure from pillars selinux

old:
linux:
  system:
    ...
    selinux: permissive

new:
linux:
  system:
    ...
    selinux:
      pkgs: ['policycoreutils', 'policycoreutils-python'],
      mode: permissive
@fpytloun
Copy link
Member

fpytloun commented Nov 21, 2018 •
edited
Loading

This is not backward compatible so all pillars using selinux: permissive will be broken when merged. I like the change anyway but you should handle backward compatibility for this in map.jinja.

@wasfree
Copy link
Contributor Author

wasfree commented Nov 21, 2018

Hi @fpytloun,

yes, this merge is not backward compatible see #182. I think it would be the better way to cleanup dependency from inux/system/repo.sls in linux/system/selinux.sls. There is a 2nd option todo this but then we will also have in future a cross include in system.

@wasfree
Copy link
Contributor Author

wasfree commented Nov 22, 2018

@fpytloun ok, let me check if we can make it also backward compatible

This is fix for salt-formulas#182 part 2. Add backward compatibility.
a8dee64 
- We will check now if pillar system.selinux is a map for new format
- If system.selinux is not a map use old format
- policycoreutils and policycoreutils-python are not nessasary for basic selinux configuration
  we need this packages later to add selinux rules.
- Added new format to test pillars
@wasfree
Copy link
Contributor Author

wasfree commented Nov 22, 2018

Hi @fpytloun,

please check now, it is possible to use old pillar and new pillar format. We check in system.selinux if it is a map or not.

epcim
epcim approved these changes Nov 22, 2018
View reviewed changes
Copy link
Member

@epcim epcim left a comment

Choose a reason for hiding this comment

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

lg

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epcim epcim epcim approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wasfree @fpytloun @epcim