commit | f575f6110e8b925d7dc651614606689f603e308d | [log] [tgz] |
---|---|---|
author | mcp-jenkins <mcp-jenkins@mirantis.com> | Fri Jan 19 12:15:58 2018 +0000 |
committer | Gerrit Code Review <gerrit2@56fc70e46927> | Fri Jan 19 12:15:58 2018 +0000 |
tree | 502ddd2b818310e05e5534c914382069f23ed1de | |
parent | 8d5afbf9f198fbe31ae2c3c06c176f6323e56302 [diff] | |
parent | f241bb77796d54ac662f26607912fba1ceca4448 [diff] |
Merge "Fix installing cross-formula dependencies"
diff --git a/salt/files/master.conf b/salt/files/master.conf index ddbbf18..9f9b00a 100644 --- a/salt/files/master.conf +++ b/salt/files/master.conf
@@ -189,6 +189,8 @@ file_recv: {{ master.get('file_recv', False) }} +id: {{ system.name }}.{{ system.domain }} + {#- vim: syntax=jinja -#}