浏览代码

Merge branch 'mine_publish' into 'master'

Mine publish

See merge request !11
tags/0.4
Jakub Pavlik 8 年前
父节点
当前提交
eb8e8c9e81
共有 2 个文件被更改,包括 8 次插入0 次删除
  1. +1
    -0
      salt/minion/cert.sls
  2. +7
    -0
      salt/minion/grains.sls

+ 1
- 0
salt/minion/cert.sls 查看文件

@@ -12,6 +12,7 @@
file.managed:
- name: /etc/ssl/private/{{ cert.common_name }}.key
- mode: 600
- replace: False
- require:
- x509: /etc/ssl/private/{{ cert.common_name }}.key


+ 7
- 0
salt/minion/grains.sls 查看文件

@@ -27,4 +27,11 @@ salt_minion_grains_file:
- watch_in:
- service: salt_minion_service

salt_minion_grains_publish:
module.run:
- name: mine.send
- name: grains.items
- require:
- cmd: salt_minion_grains_file

{%- endif %}

正在加载...
取消
保存