소스 검색

feat(`tofs`): allow TOFS for master configuration

tags/v0.58.0
Imran Iqbal 5 년 전
부모
커밋
1b202afb29
No account linked to committer's email address
7개의 변경된 파일32개의 추가작업 그리고 2개의 파일을 삭제
  1. +4
    -1
      pillar.example
  2. +1
    -0
      salt/defaults.yaml
  3. +4
    -0
      salt/files/default/master.d/engine.conf
  4. +4
    -0
      salt/files/default/master.d/f_defaults.conf
  5. +4
    -0
      salt/files/default/master.d/lxc_profiles.conf
  6. +4
    -0
      salt/files/default/master.d/reactor.conf
  7. +11
    -1
      salt/master.sls

+ 4
- 1
pillar.example 파일 보기

@@ -64,9 +64,12 @@ salt:
# dirs:
# files: files_alt
# default: default_alt
# source_files: {}
# source_files:
# salt-master:
# - 'alt_master.d'

# salt master config
master_config_use_TOFS: True
master:
fileserver_backend:
- git

+ 1
- 0
salt/defaults.yaml 파일 보기

@@ -10,6 +10,7 @@ salt:

minion_remove_config: False
master_remove_config: False
master_config_use_TOFS: False

minion_service: salt-minion
master_service: salt-master

+ 4
- 0
salt/files/default/master.d/engine.conf 파일 보기

@@ -0,0 +1,4 @@
########################################################################
## File managed by Salt.
## Your changes will be overwritten.
########################################################################

+ 4
- 0
salt/files/default/master.d/f_defaults.conf 파일 보기

@@ -0,0 +1,4 @@
########################################################################
## File managed by Salt.
## Your changes will be overwritten.
########################################################################

+ 4
- 0
salt/files/default/master.d/lxc_profiles.conf 파일 보기

@@ -0,0 +1,4 @@
########################################################################
## File managed by Salt.
## Your changes will be overwritten.
########################################################################

+ 4
- 0
salt/files/default/master.d/reactor.conf 파일 보기

@@ -0,0 +1,4 @@
########################################################################
## File managed by Salt.
## Your changes will be overwritten.
########################################################################

+ 11
- 1
salt/master.sls 파일 보기

@@ -1,4 +1,6 @@
{% from "salt/map.jinja" import salt_settings with context %}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/map.jinja" import salt_settings with context %}
{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %}

salt-master:
{% if salt_settings.install_packages %}
@@ -14,8 +16,16 @@ salt-master:
{% endif %}
file.recurse:
- name: {{ salt_settings.config_path }}/master.d
{%- if salt_settings.master_config_use_TOFS %}
- template: ''
- source: {{ files_switch(['master.d'],
lookup='salt-master'
)
}}
{%- else %}
- template: jinja
- source: salt://{{ slspath }}/files/master.d
{%- endif %}
- clean: {{ salt_settings.clean_config_d_dir }}
- exclude_pat: _*
service.running:

Loading…
취소
저장