From 8172d7725fbaaeec60e171096ad6f1853b2cbbe8 Mon Sep 17 00:00:00 2001 From: Eric Nordlund Date: Tue, 1 Oct 2013 12:56:27 -0700 Subject: Fix typo in mkpasswd command: '-s' was used instead of '-R' for salt rounds. Remove duplicate 'password' text. --- doc/examples/cloud-config-user-groups.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 doc/examples/cloud-config-user-groups.txt diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt old mode 100644 new mode 100755 index de5f321b..ad341005 --- a/doc/examples/cloud-config-user-groups.txt +++ b/doc/examples/cloud-config-user-groups.txt @@ -46,8 +46,8 @@ users: # inactive: Create the user as inactive # passwd: The hash -- not the password itself -- of the password you want # to use for this user. You can generate a safe hash via: -# mkpasswd -m SHA-512 -s 4096 -# (the above command would create a password SHA512 password hash +# mkpasswd -m SHA-512 -R 4096 +# (the above command would create from stdin an SHA-512 password hash # with 4096 salt rounds) # # Please note: while the use of a hashed password is better than -- cgit v1.2.3 From 1aa4d4ea6835221719a12134a8314d6d4b8eeb61 Mon Sep 17 00:00:00 2001 From: Eric Nordlund Date: Tue, 1 Oct 2013 14:19:43 -0700 Subject: Reordered several imports in order for test suite to pass. --- cloudinit/config/cc_disk_setup.py | 2 +- tests/unittests/test_datasource/test_azure.py | 2 +- tests/unittests/test_datasource/test_opennebula.py | 2 +- tests/unittests/test_handler/test_handler_seed_random.py | 3 ++- tests/unittests/test_userdata.py | 2 +- tests/unittests/test_util.py | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) mode change 100644 => 100755 cloudinit/config/cc_disk_setup.py mode change 100644 => 100755 tests/unittests/test_datasource/test_azure.py mode change 100644 => 100755 tests/unittests/test_datasource/test_opennebula.py mode change 100644 => 100755 tests/unittests/test_handler/test_handler_seed_random.py mode change 100644 => 100755 tests/unittests/test_userdata.py mode change 100644 => 100755 tests/unittests/test_util.py diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py old mode 100644 new mode 100755 index d274f81a..ade9c2ad --- a/cloudinit/config/cc_disk_setup.py +++ b/cloudinit/config/cc_disk_setup.py @@ -16,8 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from cloudinit import util from cloudinit.settings import PER_INSTANCE +from cloudinit import util import logging import shlex diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py old mode 100644 new mode 100755 index 86e2ed8c..df7e52d0 --- a/tests/unittests/test_datasource/test_azure.py +++ b/tests/unittests/test_datasource/test_azure.py @@ -2,8 +2,8 @@ from cloudinit import helpers from cloudinit.sources import DataSourceAzure from tests.unittests.helpers import populate_dir -import crypt import base64 +import crypt from mocker import MockerTestCase import os import yaml diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py old mode 100644 new mode 100755 index 45256a86..e1812a88 --- a/tests/unittests/test_datasource/test_opennebula.py +++ b/tests/unittests/test_datasource/test_opennebula.py @@ -1,5 +1,5 @@ -from cloudinit.sources import DataSourceOpenNebula as ds from cloudinit import helpers +from cloudinit.sources import DataSourceOpenNebula as ds from cloudinit import util from mocker import MockerTestCase from tests.unittests.helpers import populate_dir diff --git a/tests/unittests/test_handler/test_handler_seed_random.py b/tests/unittests/test_handler/test_handler_seed_random.py old mode 100644 new mode 100755 index 1b0675bb..1c0d284c --- a/tests/unittests/test_handler/test_handler_seed_random.py +++ b/tests/unittests/test_handler/test_handler_seed_random.py @@ -19,8 +19,9 @@ from cloudinit.config import cc_seed_random import base64 -import tempfile import gzip +import tempfile + from StringIO import StringIO diff --git a/tests/unittests/test_userdata.py b/tests/unittests/test_userdata.py old mode 100644 new mode 100755 index b227616c..5ffe8f0a --- a/tests/unittests/test_userdata.py +++ b/tests/unittests/test_userdata.py @@ -6,9 +6,9 @@ import gzip import logging import os +from email.mime.application import MIMEApplication from email.mime.base import MIMEBase from email.mime.multipart import MIMEMultipart -from email.mime.application import MIMEApplication from cloudinit import handlers from cloudinit import helpers as c_helpers diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py old mode 100644 new mode 100755 index 87415cb5..38ab0c96 --- a/tests/unittests/test_util.py +++ b/tests/unittests/test_util.py @@ -5,8 +5,8 @@ import stat import yaml from mocker import MockerTestCase -from unittest import TestCase from tests.unittests import helpers +from unittest import TestCase from cloudinit import importer from cloudinit import util -- cgit v1.2.3 From fee4bb00a51d591942a79443d0721742c0f4bf04 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 2 Oct 2013 09:23:59 -0400 Subject: use long format args rather than short --- doc/examples/cloud-config-user-groups.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt index ad341005..01548380 100755 --- a/doc/examples/cloud-config-user-groups.txt +++ b/doc/examples/cloud-config-user-groups.txt @@ -46,7 +46,7 @@ users: # inactive: Create the user as inactive # passwd: The hash -- not the password itself -- of the password you want # to use for this user. You can generate a safe hash via: -# mkpasswd -m SHA-512 -R 4096 +# mkpasswd --method=SHA-512 --rounds=4096 # (the above command would create from stdin an SHA-512 password hash # with 4096 salt rounds) # -- cgit v1.2.3 From c8abc4a6dc53624809a1fcd065ac132678f376ef Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 2 Oct 2013 09:25:36 -0400 Subject: fix permission changes --- cloudinit/config/cc_disk_setup.py | 0 doc/examples/cloud-config-user-groups.txt | 0 tests/unittests/test_datasource/test_azure.py | 0 tests/unittests/test_datasource/test_opennebula.py | 0 tests/unittests/test_handler/test_handler_seed_random.py | 0 tests/unittests/test_userdata.py | 0 tests/unittests/test_util.py | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 cloudinit/config/cc_disk_setup.py mode change 100755 => 100644 doc/examples/cloud-config-user-groups.txt mode change 100755 => 100644 tests/unittests/test_datasource/test_azure.py mode change 100755 => 100644 tests/unittests/test_datasource/test_opennebula.py mode change 100755 => 100644 tests/unittests/test_handler/test_handler_seed_random.py mode change 100755 => 100644 tests/unittests/test_userdata.py mode change 100755 => 100644 tests/unittests/test_util.py diff --git a/cloudinit/config/cc_disk_setup.py b/cloudinit/config/cc_disk_setup.py old mode 100755 new mode 100644 diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt old mode 100755 new mode 100644 diff --git a/tests/unittests/test_datasource/test_azure.py b/tests/unittests/test_datasource/test_azure.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_datasource/test_opennebula.py b/tests/unittests/test_datasource/test_opennebula.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_handler/test_handler_seed_random.py b/tests/unittests/test_handler/test_handler_seed_random.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_userdata.py b/tests/unittests/test_userdata.py old mode 100755 new mode 100644 diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py old mode 100755 new mode 100644 -- cgit v1.2.3