diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/tests/api/openstack/compute/test_servers.py | 2 | ||||
| -rw-r--r-- | nova/virt/disk/api.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py index 4a78c3c3a..e9607bd7c 100644 --- a/nova/tests/api/openstack/compute/test_servers.py +++ b/nova/tests/api/openstack/compute/test_servers.py @@ -2140,7 +2140,7 @@ class ServersControllerCreateTest(test.TestCase): res = self.controller.create(req, body).obj server = res['server'] - self.assertTrue('adminPass' in body['server'] ) + self.assertTrue('adminPass' in body['server']) self.assertTrue('adminPass' not in server) def test_create_instance_admin_pass_empty(self): diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index 51e8f1907..42ad683a6 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -397,7 +397,7 @@ def _set_passwd(username, admin_passwd, passwd_file, shadow_file): 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' '0123456789./') # encryption algo - id pairs for crypt() - algos = {'SHA-512': '$6$', 'SHA-256': '$5$', 'MD5': '$1$', 'DES': '' } + algos = {'SHA-512': '$6$', 'SHA-256': '$5$', 'MD5': '$1$', 'DES': ''} salt = 16 * ' ' salt = ''.join([random.choice(salt_set) for c in salt]) |