x/cloud-init
Code Issues Proposed changes

[merge from trunk] cc_salt_minion: install package salt-minion rather than salt

Browse Source
This commit is contained in:
Scott Moser 2012-06-29 14:22:22 -04:00
commit 569c415f80
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
0.6.4: 0.6.4:
- support relative path in AuthorizedKeysFile (LP: #970071). - support relative path in AuthorizedKeysFile (LP: #970071).
- make apt-get update run with --quiet (suitable for logging) (LP: #1012613) - 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: 0.6.3:
- add sample systemd config files [Garrett Holmstrom] - add sample systemd config files [Garrett Holmstrom]
- add Fedora support [Garrent Holstrom] (LP: #883286) - add Fedora support [Garrent Holstrom] (LP: #883286)

2
cloudinit/config/cc_salt_minion.py
View File

@ -31,7 +31,7 @@ def handle(name, cfg, cloud, log, _args):
salt_cfg = cfg['salt_minion'] salt_cfg = cfg['salt_minion']
# Start by installing the salt package ... # 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 # Ensure we can configure files at the right dir
config_dir = cloud.paths.join(False, salt_cfg.get("config_dir", config_dir = cloud.paths.join(False, salt_cfg.get("config_dir",