Skip to content

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

Open
wasfree wants to merge 2 commits into
salt-formulas:masterfrom
FHE3:improve-selinux-pkg-install
Open

This is fix for #182 - Dependency problem in linux/system/selinux.sls.#185
wasfree wants to merge 2 commits into
salt-formulas:masterfrom
FHE3:improve-selinux-pkg-install

Conversation

@wasfree

@wasfree wasfree commented Nov 21, 2018

Copy link
Copy Markdown
Contributor
  • 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

…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

fpytloun commented Nov 21, 2018

Copy link
Copy Markdown
Member

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

wasfree commented Nov 21, 2018

Copy link
Copy Markdown
Contributor Author

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

wasfree commented Nov 22, 2018

Copy link
Copy Markdown
Contributor Author

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

- 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

wasfree commented Nov 22, 2018

Copy link
Copy Markdown
Contributor Author

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 left a comment

Copy link
Copy Markdown
Member

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants