diff options
| author | Scott Moser <smoser@brickies.net> | 2017-04-27 12:50:12 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-04-27 12:50:12 -0400 |
| commit | 8310484a880690529a4936615df596d467e51708 (patch) | |
| tree | 886aeb1a6e3ca809e466ddbcacbe9741b56dafa0 /cloudinit/distros/ug_util.py | |
| parent | af63cf763946bca6163dc797195a3aeae975f8da (diff) | |
| parent | 513e99e049eab4acea14e187f59d760adc755b40 (diff) | |
| download | vyos-cloud-init-8310484a880690529a4936615df596d467e51708.tar.gz vyos-cloud-init-8310484a880690529a4936615df596d467e51708.zip | |
merge from 513e99e049ea at 0.7.9-113-g513e99e0
Diffstat (limited to 'cloudinit/distros/ug_util.py')
| -rwxr-xr-x | cloudinit/distros/ug_util.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cloudinit/distros/ug_util.py b/cloudinit/distros/ug_util.py index 53a0eafb..9378dd78 100755 --- a/cloudinit/distros/ug_util.py +++ b/cloudinit/distros/ug_util.py @@ -214,8 +214,8 @@ def normalize_users_groups(cfg, distro): 'name': old_user, } if not isinstance(old_user, dict): - LOG.warn(("Format for 'user' key must be a string or " - "dictionary and not %s"), type_utils.obj_name(old_user)) + LOG.warning(("Format for 'user' key must be a string or dictionary" + " and not %s"), type_utils.obj_name(old_user)) old_user = {} # If no old user format, then assume the distro @@ -227,9 +227,9 @@ def normalize_users_groups(cfg, distro): try: distro_user_config = distro.get_default_user() except NotImplementedError: - LOG.warn(("Distro has not implemented default user " - "access. No distribution provided default user" - " will be normalized.")) + LOG.warning(("Distro has not implemented default user " + "access. No distribution provided default user" + " will be normalized.")) # Merge the old user (which may just be an empty dict when not # present with the distro provided default user configuration so @@ -239,9 +239,9 @@ def normalize_users_groups(cfg, distro): base_users = cfg.get('users', []) if not isinstance(base_users, (list, dict) + six.string_types): - LOG.warn(("Format for 'users' key must be a comma separated string" - " or a dictionary or a list and not %s"), - type_utils.obj_name(base_users)) + LOG.warning(("Format for 'users' key must be a comma separated string" + " or a dictionary or a list and not %s"), + type_utils.obj_name(base_users)) base_users = [] if old_user: |