updated provision state
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Paul 2023-01-16 12:01:49 +01:00
parent 835cffb430
commit 5f5f3945cd
3 changed files with 15 additions and 7 deletions

View File

@ -2,9 +2,14 @@
specs: specs:
enabled: true enabled: true
type: none type: none
entity: none org: none
country: none country: None
location: none location: None
cloud: false cloud: false
container: false container: false
sudo: true sudo: true
lb: false
provision:
highstate_interval: 30
clear_cache_interval: 7

View File

@ -1,17 +1,18 @@
--- ---
{%- from "provision/map.jinja" import provision with context %}
{%- from "provision/map.jinja" import specs with context %} {%- from "provision/map.jinja" import specs with context %}
schedule_highstate: schedule_highstate:
schedule.present: schedule.present:
- name: schedule_highstate - name: schedule_highstate
- function: state.highstate - function: state.highstate
- minutes: 30 - minutes: {{ provision.highstate_interval }}
- run_on_start: false - run_on_start: false
schedule_saltutil_clear_cache: schedule_saltutil_clear_cache:
schedule.present: schedule.present:
- name: schedule_saltutil_clear_cache - name: schedule_saltutil_clear_cache
- function: saltutil.clear_cache - function: saltutil.clear_cache
- days: 7 - days: {{ provision.clear_cache_interval }}
- run_on_start: false - run_on_start: false
{% for key, value in specs.items() %} {% for key, value in specs.items() %}

View File

@ -1,5 +1,7 @@
{%- import_yaml "provision/defaults.yaml" as default_settings -%} {%- import_yaml "provision/defaults.yaml" as default_settings -%}
{%- set defaults = salt['grains.filter_by'](default_settings, default='specs') -%} {%- set defaults_specs = salt['grains.filter_by'](default_settings, default='specs') -%}
{%- set defaults_provision = salt['grains.filter_by'](default_settings, default='provision') -%}
{%- set specs = salt['pillar.get']('specs', default=defaults, merge=True) -%} {%- set specs = salt['pillar.get']('specs', default=defaults_specs, merge=True) -%}
{%- set provision = salt['pillar.get']('provision', default=defaults_provision, merge=True) -%}