diff options
| author | Chad Smith <chad.smith@canonical.com> | 2022-01-18 20:46:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 20:46:14 -0700 |
| commit | 20bd192db661e519b860a0799de04c663ceae0c6 (patch) | |
| tree | 1f23a6d2f970a27b10013b7cce0819d5d4157f9b /cloudinit | |
| parent | c2c2a663edccd9fcb74f3bed24a6daad09c45d2a (diff) | |
| download | vyos-cloud-init-20bd192db661e519b860a0799de04c663ceae0c6.tar.gz vyos-cloud-init-20bd192db661e519b860a0799de04c663ceae0c6.zip | |
cmd: status and cloud-id avoid change in behavior for 'not run' (#1197)
snapd currrently looks for 'not run' from cloud-init status[1].
Avoid changing this behavior and revert "not-run" value to
"not run".
This avoids having to get snapd to change implementation and
release updates as far back as Bionic to handle a hyphenated
not-run string.
[1]: https://github.com/snapcore/snapd/blob/master/sysconfig/\
cloudinit.go#L802
Diffstat (limited to 'cloudinit')
| -rwxr-xr-x | cloudinit/cmd/cloud_id.py | 2 | ||||
| -rw-r--r-- | cloudinit/cmd/status.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/cmd/cloud_id.py b/cloudinit/cmd/cloud_id.py index b71c19de..b9c30fb4 100755 --- a/cloudinit/cmd/cloud_id.py +++ b/cloudinit/cmd/cloud_id.py @@ -63,7 +63,7 @@ def handle_args(name, args): Print the canonical cloud-id on which the instance is running. - @return: 0 on success, 1 on error, 2 on disabled, 3 on cloud-init not-run. + @return: 0 on success, 1 on error, 2 on disabled, 3 on cloud-init not run. """ status, _status_details, _time = get_status_details() if status == UXAppStatus.DISABLED: diff --git a/cloudinit/cmd/status.py b/cloudinit/cmd/status.py index 597e5bfb..5176549d 100644 --- a/cloudinit/cmd/status.py +++ b/cloudinit/cmd/status.py @@ -22,7 +22,7 @@ CLOUDINIT_DISABLED_FILE = "/etc/cloud/cloud-init.disabled" class UXAppStatus(enum.Enum): """Enum representing user-visible cloud-init application status.""" - NOT_RUN = "not-run" + NOT_RUN = "not run" RUNNING = "running" DONE = "done" ERROR = "error" |