1
diff --git a/cloudinit/config/cc_salt_minion.py b/cloudinit/config/cc_salt_minion.py
2
index f5786a3..13d70c8 100644
3
--- a/cloudinit/config/cc_salt_minion.py
4
+++ b/cloudinit/config/cc_salt_minion.py
5
@@ -46,7 +46,12 @@ def handle(name, cfg, cloud, log, _args):
6
46
46
7
47
    # ... copy the key pair if specified
47
    # ... copy the key pair if specified
8
48
    if 'public_key' in salt_cfg and 'private_key' in salt_cfg:
48
    if 'public_key' in salt_cfg and 'private_key' in salt_cfg:
10
49
        pki_dir = salt_cfg.get('pki_dir', '/etc/salt/pki')
49
        if os.path.isdir("/etc/salt/pki/minion"):
11
50
            pki_dir_default = "/etc/salt/pki/minion"
12
51
        else:
13
52
            pki_dir_default = "/etc/salt/pki"
14
53
15
54
        pki_dir = salt_cfg.get('pki_dir', pki_dir_default)
16
50
        with util.umask(0o77):
55
        with util.umask(0o77):
17
51
            util.ensure_dir(pki_dir)
56
            util.ensure_dir(pki_dir)
18
52
            pub_name = os.path.join(pki_dir, 'minion.pub')
57
            pub_name = os.path.join(pki_dir, 'minion.pub')
Reviewer	Review Type	Date Requested	Status
Ryan Harper		2016-08-30	Approve on 2016-08-31
Review via email: mp+304415@code.launchpad.net