Comment 5 for bug 996166

Revision history for this message
Scott Moser (smoser) wrote :

Jeff,
  FWIW, the source and target of your merge proposal were reversed. You had requested that lp:cloud-init be merged into lp:~jbaur/cloud-init/salt.

I've gone ahead and taken the necessary change and committed it to trunk.

--- cloudinit/CloudConfig/cc_salt_minion.py 2012-02-17 15:04:49 +0000
+++ cloudinit/CloudConfig/cc_salt_minion.py 2012-06-20 18:04:27 +0000
@@ -27,7 +27,7 @@
         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)