diff options
author | Scott Moser <smoser@ubuntu.com> | 2012-08-22 20:39:15 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2012-08-22 20:39:15 -0400 |
commit | d59ab509f6482b8b3af4fd9f2728ad1209d5b2e2 (patch) | |
tree | d60921f18cf63946857cba0a621f44775e25b23e /cloudinit/config | |
parent | 6564861d44f843bb4e339db5691021ec7a95c511 (diff) | |
download | vyos-cloud-init-d59ab509f6482b8b3af4fd9f2728ad1209d5b2e2.tar.gz vyos-cloud-init-d59ab509f6482b8b3af4fd9f2728ad1209d5b2e2.zip |
fix errors from 'make pep8'
Diffstat (limited to 'cloudinit/config')
-rw-r--r-- | cloudinit/config/cc_set_passwords.py | 2 | ||||
-rw-r--r-- | cloudinit/config/cc_ssh_import_id.py | 2 | ||||
-rw-r--r-- | cloudinit/config/cc_users_groups.py | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/cloudinit/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py index 4bf62aa9..7d0fbd9f 100644 --- a/cloudinit/config/cc_set_passwords.py +++ b/cloudinit/config/cc_set_passwords.py @@ -53,7 +53,7 @@ def handle(_name, cfg, cloud, log, args): user = cloud.distro.get_default_user() if 'users' in cfg: - user_zero = cfg['users'].keys()[0] + user_zero = cfg['users'].keys()[0] if user_zero != "default": user = user_zero diff --git a/cloudinit/config/cc_ssh_import_id.py b/cloudinit/config/cc_ssh_import_id.py index 9aee2166..cd97b99b 100644 --- a/cloudinit/config/cc_ssh_import_id.py +++ b/cloudinit/config/cc_ssh_import_id.py @@ -35,7 +35,7 @@ def handle(name, cfg, cloud, log, args): user = cloud.distro.get_default_user() if 'users' in cfg: - user_zero = cfg['users'].keys()[0] + user_zero = cfg['users'].keys()[0] if user_zero != "default": user = user_zero diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py index 7e5ecc7b..cbb351dc 100644 --- a/cloudinit/config/cc_users_groups.py +++ b/cloudinit/config/cc_users_groups.py @@ -17,14 +17,14 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. import grp -import pwd import os +import pwd import traceback +from cloudinit.settings import PER_INSTANCE +from cloudinit import ssh_util from cloudinit import templater from cloudinit import util -from cloudinit import ssh_util -from cloudinit.settings import PER_INSTANCE frequency = PER_INSTANCE @@ -45,7 +45,7 @@ def handle(name, cfg, cloud, log, _args): else: cloud.distro.create_group(item, []) - if 'users' in cfg: + if 'users' in cfg: user_zero = None for name, user_config in cfg['users'].iteritems(): @@ -68,8 +68,8 @@ def handle(name, cfg, cloud, log, _args): if user_zero == name: user_zero = None - log.warn("Distro has not implemented default user " \ - "creation. No default user will be created") + log.warn("Distro has not implemented default user " + "creation. No default user will be created") else: # Make options friendly for distro.create_user new_opts = {} |