LibertaCasa/salt
LibertaCasa/salt
9
1
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge pull request 'Exclude libX11 removal for FPM hosts' (#54) from libX11-php into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Details

Browse Source 
Reviewed-on: #54
This commit is contained in:
Georg Pfuetzenreuter 2023-04-30 19:58:19 +02:00
commit d8263f9b80
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nbroles_to_grains.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env sh #!/usr/bin/env sh
# This rewrites top-files to fetch roles from grains instead of our custom roles API. Useful for testing outside of the LibertaCasa infrastructure, but not recommended for production. # This rewrites top-files to fetch roles from grains instead of our custom roles API. Useful for testing outside of the LibertaCasa infrastructure, but not recommended for production.
sed -i "s/salt\['http.query'\].*/grains\['roles'\] -%}/" */top.sls sed -i "s/salt\['http.query'\].*/grains\['roles'\] -%}/" */top.sls salt/common/suse.sls

4
salt/common/suse.sls
View File

@ -1,3 +1,5 @@
{%- set roles = salt['http.query']('http://machine-roles.lysergic.dev:4580/roles', decode=True, decode_type='json', params={"machine": id})['dict']['roles'] -%}
include: include:
{#- drop pillar check after all firewall configurations have been imported #} {#- drop pillar check after all firewall configurations have been imported #}
{%- if salt['pillar.get']('manage_firewall'), False %} {%- if salt['pillar.get']('manage_firewall'), False %}
@ -65,7 +67,9 @@ common_packages_remove:
{#- we only use AutoYaST for the OS deployment #} {#- we only use AutoYaST for the OS deployment #}
- autoyast2 - autoyast2
- autoyast2-installation - autoyast2-installation
{%- if not 'php-fpm' in roles %}
- libX11-data - libX11-data
{%- endif %}
- yast2-add-on - yast2-add-on
- yast2-services-manager - yast2-services-manager
- yast2-slp - yast2-slp