diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-01-26 13:36:30 -0700 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-01-26 13:36:30 -0700 |
| commit | 1d8c327139a8c291eeb244ee1a6a8badd83e9e72 (patch) | |
| tree | 737b92f0e9d476a64e5a945fdaa0c6d7f4f2bf6f /cloudinit/cmd/status.py | |
| parent | bc84f5023f795c261e32cf0690b2d29e12cfaedd (diff) | |
| download | vyos-cloud-init-1d8c327139a8c291eeb244ee1a6a8badd83e9e72.tar.gz vyos-cloud-init-1d8c327139a8c291eeb244ee1a6a8badd83e9e72.zip | |
Fix potential cases of uninitialized variables.
While addressing undeclared variable in 'cloud-init status', I also fixed
the errors raised by automated code reviews against cloud-init master at
https://lgtm.com/projects/g/cloud-init/cloud-init/alerts
The following items are addressed:
* Fix 'cloud-init status':
* Only report 'running' state when any stage in
/run/cloud-init/status.json has a start time but no finished time.
Default start time to 0 if null.
* undeclared variable 'reason' now reports 'Cloud-init enabled by
systemd cloud-init-generator' when systemd enables cloud-init
* cc_rh_subscription.py util.subp return values aren't set during if an
exception is raised, use ProcessExecution as e instead.
* distros/freebsd.py:
* Drop repetitive looping over ipv4 and ipv6 nic lists.
* Initialize bsddev to 'NOTFOUND' in the event that no devs are
discovered
* declare nics_with_addresses = set() in broader scope outside
check_downable conditional
* cloudinit/util.py: Raise TypeError if mtype parameter isn't string,
iterable or None.
LP: #1744796
Diffstat (limited to 'cloudinit/cmd/status.py')
| -rw-r--r-- | cloudinit/cmd/status.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py index 3e5d0d07..d7aaee9d 100644 --- a/cloudinit/cmd/status.py +++ b/cloudinit/cmd/status.py @@ -93,6 +93,8 @@ def _is_cloudinit_disabled(disable_file, paths): elif not os.path.exists(os.path.join(paths.run_dir, 'enabled')): is_disabled = True reason = 'Cloud-init disabled by cloud-init-generator' + else: + reason = 'Cloud-init enabled by systemd cloud-init-generator' return (is_disabled, reason) @@ -127,10 +129,11 @@ def _get_status_details(paths): status_detail = value elif isinstance(value, dict): errors.extend(value.get('errors', [])) + start = value.get('start') or 0 finished = value.get('finished') or 0 - if finished == 0: + if finished == 0 and start != 0: status = STATUS_RUNNING - event_time = max(value.get('start', 0), finished) + event_time = max(start, finished) if event_time > latest_event: latest_event = event_time if errors: |