summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-06-20 14:04:27 -0400
committerScott Moser <smoser@ubuntu.com>2012-06-20 14:04:27 -0400
commit142fad2a9a9acb702793c33269e04d8d01fa00d6 (patch)
tree4ff7e41fb71fdd8df3841d52a7efe0aa58385c39
parente99cf80f5881abc10ebcd8927adf16bd14f3045a (diff)
downloadvyos-cloud-init-142fad2a9a9acb702793c33269e04d8d01fa00d6.tar.gz
vyos-cloud-init-142fad2a9a9acb702793c33269e04d8d01fa00d6.zip
cc_salt_minion: install package salt-minion rather than salt
LP: #996166
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/CloudConfig/cc_salt_minion.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f3393818..573e587c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
0.6.4:
- support relative path in AuthorizedKeysFile (LP: #970071).
- make apt-get update run with --quiet (suitable for logging) (LP: #1012613)
+ - cc_salt_minion: use package 'salt-minion' rather than 'salt' (LP: #996166)
0.6.3:
- add sample systemd config files [Garrett Holmstrom]
- add Fedora support [Garrent Holstrom] (LP: #883286)
diff --git a/cloudinit/CloudConfig/cc_salt_minion.py b/cloudinit/CloudConfig/cc_salt_minion.py
index 1a3b5039..59522ab8 100644
--- a/cloudinit/CloudConfig/cc_salt_minion.py
+++ b/cloudinit/CloudConfig/cc_salt_minion.py
@@ -27,7 +27,7 @@ def handle(_name, cfg, _cloud, _log, _args):
return
salt_cfg = cfg['salt_minion']
# Start by installing the salt package ...
- cc.install_packages(("salt",))
+ cc.install_packages(("salt-minion",))
config_dir = '/etc/salt'
if not os.path.isdir(config_dir):
os.makedirs(config_dir)