diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-15 23:28:51 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-15 23:28:51 -0400 |
| commit | a066f95c67bb5fa15350cdff319f60d589274c3a (patch) | |
| tree | 790d277e08dd39da82dd956c89709e17538a1a82 /cloudinit/config | |
| parent | a454a6408b3c7ecc816073049d060632191099bb (diff) | |
| parent | d598ceeb838b4ccaf667ded84bb02bf096ab7b12 (diff) | |
| download | vyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.tar.gz vyos-cloud-init-a066f95c67bb5fa15350cdff319f60d589274c3a.zip | |
merge with trunk
Diffstat (limited to 'cloudinit/config')
| -rw-r--r-- | cloudinit/config/cc_apt_configure.py | 3 | ||||
| -rw-r--r-- | cloudinit/config/cc_growpart.py | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/cloudinit/config/cc_apt_configure.py b/cloudinit/config/cc_apt_configure.py index 96c4a43d..05ad4b03 100644 --- a/cloudinit/config/cc_apt_configure.py +++ b/cloudinit/config/cc_apt_configure.py @@ -208,8 +208,9 @@ def add_apt_sources(srclist, template_params=None, aa_repo_match=None): template_params = {} if aa_repo_match is None: - def aa_repo_match(x): + def _aa_repo_match(x): return False + aa_repo_match = _aa_repo_match errorlist = [] srcdict = convert_to_new_format(srclist) diff --git a/cloudinit/config/cc_growpart.py b/cloudinit/config/cc_growpart.py index 859d69f1..40560f11 100644 --- a/cloudinit/config/cc_growpart.py +++ b/cloudinit/config/cc_growpart.py @@ -36,13 +36,13 @@ DEFAULT_CONFIG = { } -def enum(**enums): - return type('Enum', (), enums) +class RESIZE(object): + SKIPPED = "SKIPPED" + CHANGED = "CHANGED" + NOCHANGE = "NOCHANGE" + FAILED = "FAILED" -RESIZE = enum(SKIPPED="SKIPPED", CHANGED="CHANGED", NOCHANGE="NOCHANGE", - FAILED="FAILED") - LOG = logging.getLogger(__name__) |