cloud-init-dev team mailing list archive
-
cloud-init-dev team
-
Mailing list archive
-
Message #00326
[Merge] lp:~nrdlngr/cloud-init/erics-branch into lp:cloud-init
Eric Nordlund has proposed merging lp:~nrdlngr/cloud-init/erics-branch into lp:cloud-init.
Requested reviews:
cloud init development team (cloud-init-dev)
For more details, see:
https://code.launchpad.net/~nrdlngr/cloud-init/erics-branch/+merge/188723
Mostly a documentation change to doc/examples/cloud-config-user-groups file to fix an error in the mkpasswd command. I also reordered a few imports in the test files so that the make tests would complete.
--
https://code.launchpad.net/~nrdlngr/cloud-init/erics-branch/+merge/188723
Your team cloud init development team is requested to review the proposed merge of lp:~nrdlngr/cloud-init/erics-branch into lp:cloud-init.
=== modified file 'cloudinit/config/cc_disk_setup.py' (properties changed: -x to +x)
--- cloudinit/config/cc_disk_setup.py 2013-09-27 21:08:40 +0000
+++ cloudinit/config/cc_disk_setup.py 2013-10-01 21:29:02 +0000
@@ -16,8 +16,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from cloudinit.settings import PER_INSTANCE
from cloudinit import util
-from cloudinit.settings import PER_INSTANCE
import logging
import shlex
=== modified file 'doc/examples/cloud-config-user-groups.txt' (properties changed: -x to +x)
--- doc/examples/cloud-config-user-groups.txt 2012-10-23 10:13:41 +0000
+++ doc/examples/cloud-config-user-groups.txt 2013-10-01 21:29:02 +0000
@@ -46,8 +46,8 @@
# 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
=== modified file 'tests/unittests/test_datasource/test_azure.py' (properties changed: -x to +x)
--- tests/unittests/test_datasource/test_azure.py 2013-09-27 20:31:31 +0000
+++ tests/unittests/test_datasource/test_azure.py 2013-10-01 21:29:02 +0000
@@ -2,8 +2,8 @@
from cloudinit.sources import DataSourceAzure
from tests.unittests.helpers import populate_dir
+import base64
import crypt
-import base64
from mocker import MockerTestCase
import os
import yaml
=== modified file 'tests/unittests/test_datasource/test_opennebula.py' (properties changed: -x to +x)
--- tests/unittests/test_datasource/test_opennebula.py 2013-09-10 23:14:11 +0000
+++ tests/unittests/test_datasource/test_opennebula.py 2013-10-01 21:29:02 +0000
@@ -1,5 +1,5 @@
+from cloudinit import helpers
from cloudinit.sources import DataSourceOpenNebula as ds
-from cloudinit import helpers
from cloudinit import util
from mocker import MockerTestCase
from tests.unittests.helpers import populate_dir
=== modified file 'tests/unittests/test_handler/test_handler_seed_random.py' (properties changed: -x to +x)
--- tests/unittests/test_handler/test_handler_seed_random.py 2013-09-10 00:31:30 +0000
+++ tests/unittests/test_handler/test_handler_seed_random.py 2013-10-01 21:29:02 +0000
@@ -19,8 +19,9 @@
from cloudinit.config import cc_seed_random
import base64
+import gzip
import tempfile
-import gzip
+
from StringIO import StringIO
=== modified file 'tests/unittests/test_userdata.py' (properties changed: -x to +x)
--- tests/unittests/test_userdata.py 2013-07-24 17:15:59 +0000
+++ tests/unittests/test_userdata.py 2013-10-01 21:29:02 +0000
@@ -6,9 +6,9 @@
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
=== modified file 'tests/unittests/test_util.py' (properties changed: -x to +x)
--- tests/unittests/test_util.py 2013-07-24 17:31:16 +0000
+++ tests/unittests/test_util.py 2013-10-01 21:29:02 +0000
@@ -5,8 +5,8 @@
import yaml
from mocker import MockerTestCase
+from tests.unittests import helpers
from unittest import TestCase
-from tests.unittests import helpers
from cloudinit import importer
from cloudinit import util
Follow ups