浏览代码

Adding master ID to master.conf file

The patch fixes the issue when reclass adapter crashes if a new node
is tried to register in reclass metadata with reactor/runner mechanism.

This actually happens because of merged PR https://github.com/saltstack/salt/pull/15881 so
ID of master is chnaged to <NODE_NAME>_master https://github.com/saltstack/salt/blame/2017.7/salt/config/__init__.py#L3584
thats why runner modul can't fine the node and crashes.

Change-Id: I12b59db72d58d5b9d09cbd454201a75366545779
Related-PROD: PROD-17051
pull/73/head
Oleh Hryhorov 6 年前
父节点
当前提交
8d5afbf9f1
共有 1 个文件被更改,包括 2 次插入0 次删除
  1. +2
    -0
      salt/files/master.conf

+ 2
- 0
salt/files/master.conf 查看文件

@@ -189,6 +189,8 @@ nacl.config:

file_recv: {{ master.get('file_recv', False) }}

id: {{ system.name }}.{{ system.domain }}

{#-
vim: syntax=jinja
-#}

正在加载...
取消
保存