Merge pull request 'Revert OS pillar split' (#4) from revert-ospillarsplit into production
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
All checks were successful
ci/lysergic/push/pipeline Pipeline was successful
Reviewed-on: #4
This commit is contained in:
commit
7305d70822
@ -1,8 +1,13 @@
|
|||||||
include:
|
include:
|
||||||
- role.salt.common
|
- role.salt.common
|
||||||
- role.salt.minion
|
- role.salt.minion
|
||||||
- common.{{ grains['os'] | lower }}
|
- role.mta.postfix
|
||||||
|
|
||||||
managed_header_pound: |
|
managed_header_pound: |
|
||||||
### This file is managed via https://git.com.de/LibertaCasa/salt
|
### This file is managed via https://git.com.de/LibertaCasa/salt
|
||||||
### Manual changes will be overwritten
|
### Manual changes will be overwritten
|
||||||
|
|
||||||
|
{%- if grains['os'] == 'SUSE' %}
|
||||||
|
zypper:
|
||||||
|
refreshdb_force: False
|
||||||
|
{%- endif %}
|
@ -1,6 +0,0 @@
|
|||||||
include:
|
|
||||||
- .postfix
|
|
||||||
|
|
||||||
zypper:
|
|
||||||
refreshdb_force: False
|
|
||||||
|
|
@ -3,7 +3,7 @@ include:
|
|||||||
- profile.zypp
|
- profile.zypp
|
||||||
- profile.node_exporter
|
- profile.node_exporter
|
||||||
- users
|
- users
|
||||||
- .postfix
|
- role.mta.postfix
|
||||||
|
|
||||||
{#- to-do: move this to some formula or macro -#}
|
{#- to-do: move this to some formula or macro -#}
|
||||||
{%- set osfullname = grains['osfullname'] -%}
|
{%- set osfullname = grains['osfullname'] -%}
|
||||||
|
Loading…
Reference in New Issue
Block a user