diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-06-29 14:22:22 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-06-29 14:22:22 -0400 |
| commit | 853ce299a144670cc7e4ac419c1ec0768c0ef113 (patch) | |
| tree | e976fd040adef7d21a1f107bd9b6e5295c79c038 | |
| parent | a1a7b1ce28ae57b57d98d6a06bca2a519b9b8f00 (diff) | |
| parent | 142fad2a9a9acb702793c33269e04d8d01fa00d6 (diff) | |
| download | vyos-cloud-init-853ce299a144670cc7e4ac419c1ec0768c0ef113.tar.gz vyos-cloud-init-853ce299a144670cc7e4ac419c1ec0768c0ef113.zip | |
[merge from trunk] cc_salt_minion: install package salt-minion rather than salt
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/config/cc_salt_minion.py | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -3,6 +3,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/config/cc_salt_minion.py b/cloudinit/config/cc_salt_minion.py index ff90d07a..79ed8807 100644 --- a/cloudinit/config/cc_salt_minion.py +++ b/cloudinit/config/cc_salt_minion.py @@ -31,7 +31,7 @@ def handle(name, cfg, cloud, log, _args): salt_cfg = cfg['salt_minion'] # Start by installing the salt package ... - cloud.distro.install_packages(["salt"]) + cloud.distro.install_packages(["salt-minion"]) # Ensure we can configure files at the right dir config_dir = cloud.paths.join(False, salt_cfg.get("config_dir", |