summaryrefslogtreecommitdiff
path: root/cloudinit/distros
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-08-22 20:39:15 -0400
committerScott Moser <smoser@ubuntu.com>2012-08-22 20:39:15 -0400
commitd59ab509f6482b8b3af4fd9f2728ad1209d5b2e2 (patch)
treed60921f18cf63946857cba0a621f44775e25b23e /cloudinit/distros
parent6564861d44f843bb4e339db5691021ec7a95c511 (diff)
downloadvyos-cloud-init-d59ab509f6482b8b3af4fd9f2728ad1209d5b2e2.tar.gz
vyos-cloud-init-d59ab509f6482b8b3af4fd9f2728ad1209d5b2e2.zip
fix errors from 'make pep8'
Diffstat (limited to 'cloudinit/distros')
-rw-r--r--cloudinit/distros/__init__.py3
-rw-r--r--cloudinit/distros/ubuntu.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 2dfb1409..1f46c5aa 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -31,8 +31,8 @@ import re
from cloudinit import importer
from cloudinit import log as logging
-from cloudinit import util
from cloudinit import ssh_util
+from cloudinit import util
# TODO(harlowja): Make this via config??
IFACE_ACTIONS = {
@@ -192,7 +192,6 @@ class Distro(object):
def get_default_user(self):
return None
-
def create_user(self, name, **kwargs):
"""
Creates users for the system using the GNU passwd tools. This
diff --git a/cloudinit/distros/ubuntu.py b/cloudinit/distros/ubuntu.py
index 423fee73..a6d665e0 100644
--- a/cloudinit/distros/ubuntu.py
+++ b/cloudinit/distros/ubuntu.py
@@ -25,8 +25,9 @@ from cloudinit import distros
from cloudinit.distros import debian
from cloudinit import helpers
from cloudinit import log as logging
-from cloudinit import util
from cloudinit.settings import PER_INSTANCE
+from cloudinit import util
+
import hashlib
import pwd