Revert OS pillar split #4
@ -1,8 +1,13 @@
 | 
			
		||||
include:
 | 
			
		||||
  - role.salt.common
 | 
			
		||||
  - role.salt.minion
 | 
			
		||||
  - common.{{ grains['os'] | lower }}
 | 
			
		||||
  - role.mta.postfix
 | 
			
		||||
 | 
			
		||||
managed_header_pound: |
 | 
			
		||||
  ### This file is managed via https://git.com.de/LibertaCasa/salt
 | 
			
		||||
  ### 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.node_exporter
 | 
			
		||||
  - users
 | 
			
		||||
  - .postfix
 | 
			
		||||
  - role.mta.postfix
 | 
			
		||||
 | 
			
		||||
{#- to-do: move this to some formula or macro -#}
 | 
			
		||||
{%- set osfullname = grains['osfullname'] -%}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user