Exclude libX11 removal for FPM hosts
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Needed for some PHP extensions. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
21f8818a52
commit
269b30ce9f
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user