Comment 3 for bug 1609899

diff -uNr cloud-init-0.7.7~bzr1256/cloudinit/config/cc_salt_minion.py cloud-init-0.7.7~bzr1256-salt-pki-path/cloudinit/config/cc_salt_minion.py
--- cloud-init-0.7.7~bzr1256/cloudinit/config/cc_salt_minion.py 2016-07-14 11:49:20.000000000 -0700
+++ cloud-init-0.7.7~bzr1256-salt-pki-path/cloudinit/config/cc_salt_minion.py 2016-08-04 11:34:39.092898311 -0700
@@ -46,7 +46,7 @@

     # ... copy the key pair if specified
     if 'public_key' in salt_cfg and 'private_key' in salt_cfg:
- pki_dir = salt_cfg.get('pki_dir', '/etc/salt/pki')
+ pki_dir = salt_cfg.get('pki_dir', '/etc/salt/pki/minion')
         with util.umask(0o77):
             util.ensure_dir(pki_dir)
             pub_name = os.path.join(pki_dir, 'minion.pub')