summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnicronNL <kim.sidney@gmail.com>2018-11-19 21:30:54 +0100
committerUnicronNL <kim.sidney@gmail.com>2018-11-19 21:30:54 +0100
commitc64e526a98d4ea8ee3a300bf36cd4348cd46a56c (patch)
tree7b4677c669d3038653416af71c8086cf619aa35d
parent4778c2f536a877cddb08e504b81c288c99df0d95 (diff)
downloadvyos-salt-minion-c64e526a98d4ea8ee3a300bf36cd4348cd46a56c.tar.gz
vyos-salt-minion-c64e526a98d4ea8ee3a300bf36cd4348cd46a56c.zip
rename ID to id
-rw-r--r--interface-definitions/salt-minion.xml2
-rwxr-xr-xsrc/conf_mode/salt-minion.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/interface-definitions/salt-minion.xml b/interface-definitions/salt-minion.xml
index 97e24f7..04ce045 100644
--- a/interface-definitions/salt-minion.xml
+++ b/interface-definitions/salt-minion.xml
@@ -60,7 +60,7 @@
<multi/>
</properties>
</leafNode>
- <leafNode name="ID">
+ <leafNode name="id">
<properties>
<help>Explicitly declare the id for this minion to use.</help>
</properties>
diff --git a/src/conf_mode/salt-minion.py b/src/conf_mode/salt-minion.py
index 1ee0659..303ddae 100755
--- a/src/conf_mode/salt-minion.py
+++ b/src/conf_mode/salt-minion.py
@@ -128,8 +128,8 @@ def get_config():
master = conf.return_values('master')
salt['master'] = master
- if conf.exists('ID'):
- salt['salt_id'] = conf.return_value('ID')
+ if conf.exists('id'):
+ salt['salt_id'] = conf.return_value('id')
if conf.exists('user'):
salt['user'] = conf.return_value('user')