diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-12 23:29:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-12 23:29:04 +0000 |
| commit | 28e6bc7e82fc028899e1b83f4da760c5f4d98492 (patch) | |
| tree | 51dcd88a958a2fc6334716a6cd61db607f172cda /nova/virt | |
| parent | f8ddb4dd1fce5bf6332e360cc26743f8a32d4a18 (diff) | |
| parent | a59b48e68479ff2347418239b8ed337c4d5c013c (diff) | |
Merge "Use Python 3.x compatible octal literals"
Diffstat (limited to 'nova/virt')
| -rwxr-xr-x | nova/virt/disk/api.py | 8 | ||||
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 9fdec0e87..5b8782924 100755 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -425,7 +425,7 @@ def _setup_selinux_for_keys(fs, sshdir): restorecon.insert(0, '#!/bin/sh') _inject_file_into_fs(fs, rclocal, ''.join(restorecon), append=True) - fs.set_permissions(rclocal, 0700) + fs.set_permissions(rclocal, 0o700) def _inject_key_into_fs(key, fs): @@ -439,7 +439,7 @@ def _inject_key_into_fs(key, fs): sshdir = os.path.join('root', '.ssh') fs.make_path(sshdir) fs.set_ownership(sshdir, "root", "root") - fs.set_permissions(sshdir, 0700) + fs.set_permissions(sshdir, 0o700) keyfile = os.path.join(sshdir, 'authorized_keys') @@ -452,7 +452,7 @@ def _inject_key_into_fs(key, fs): ]) _inject_file_into_fs(fs, keyfile, key_data, append=True) - fs.set_permissions(keyfile, 0600) + fs.set_permissions(keyfile, 0o600) _setup_selinux_for_keys(fs, sshdir) @@ -467,7 +467,7 @@ def _inject_net_into_fs(net, fs): netdir = os.path.join('etc', 'network') fs.make_path(netdir) fs.set_ownership(netdir, "root", "root") - fs.set_permissions(netdir, 0744) + fs.set_permissions(netdir, 0o744) netfile = os.path.join('etc', 'network', 'interfaces') _inject_file_into_fs(fs, netfile, net) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 91d5b1a50..6dde42d5a 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1774,7 +1774,7 @@ class LibvirtDriver(driver.ComputeDriver): # NOTE(vish): No need add the suffix to console.log libvirt_utils.write_to_file( - self._get_console_log_path(instance), '', 007) + self._get_console_log_path(instance), '', 7) if not disk_images: disk_images = {'image_id': instance['image_ref'], |