~smoser/cloud-init/trunk.new-ds

« back to all changes in this revision

Viewing changes to cloudinit/config/cc_salt_minion.py

  • Committer: Scott Moser
  • Date: 2015-02-11 01:53:20 UTC
  • mfrom: (1052.1.45 py2-3.smoser)
  • Revision ID: smoser@ubuntu.com-20150211015320-049dv6n1mk2in7l1
python3 support.

This gives us functional python3 support.  There are likely
still bugs, but instance boot on openstack is functional now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
    # ... copy the key pair if specified
48
48
    if 'public_key' in salt_cfg and 'private_key' in salt_cfg:
49
49
        pki_dir = salt_cfg.get('pki_dir', '/etc/salt/pki')
50
 
        with util.umask(077):
 
50
        with util.umask(0o77):
51
51
            util.ensure_dir(pki_dir)
52
52
            pub_name = os.path.join(pki_dir, 'minion.pub')
53
53
            pem_name = os.path.join(pki_dir, 'minion.pem')