|
 |
76dbdd |
From a3b9673481bbe2fa35986aa757fd5321c3a7a371 Mon Sep 17 00:00:00 2001
|
|
|
76dbdd |
From: Eduardo Otubo <otubo@redhat.com>
|
|
|
76dbdd |
Date: Wed, 12 Feb 2020 13:08:38 +0100
|
|
|
76dbdd |
Subject: [PATCH] cmd:main.py: Fix missing 'modules-init' key in modes dict
|
|
|
76dbdd |
|
|
|
76dbdd |
RH-Author: Eduardo Otubo <otubo@redhat.com>
|
|
|
76dbdd |
Message-id: <20200212130838.24592-1-otubo@redhat.com>
|
|
|
76dbdd |
Patchwork-id: 93781
|
|
|
76dbdd |
O-Subject: [RHEL-7.9/RHEL-8.2.0 cloud-init PATCH] cmd:main.py: Fix missing 'modules-init' key in modes dict
|
|
|
76dbdd |
Bugzilla: 1802140
|
|
|
76dbdd |
RH-Acked-by: Cathy Avery <cavery@redhat.com>
|
|
|
76dbdd |
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
|
|
|
76dbdd |
|
|
|
76dbdd |
BZ: 1673170
|
|
|
76dbdd |
BRANCH: rhel7/master-18.5
|
|
|
76dbdd |
UPSTREAM: bdd9c0ac
|
|
|
76dbdd |
BREW: 26372362
|
|
|
76dbdd |
|
|
|
76dbdd |
BZ: 1802140
|
|
|
76dbdd |
BRANCH: rhel820/master-18.5
|
|
|
76dbdd |
UPSTREAM: bdd9c0ac
|
|
|
76dbdd |
BREW: 26372415
|
|
|
76dbdd |
|
|
|
76dbdd |
commit 96557ca26a73c490aee74a811c3a44ef1ac11d84
|
|
|
76dbdd |
Author: Antonio Romito <antonio.romito@manicom.io>
|
|
|
76dbdd |
Date: Tue Apr 9 14:54:23 2019 +0000
|
|
|
76dbdd |
|
|
|
76dbdd |
cmd:main.py: Fix missing 'modules-init' key in modes dict
|
|
|
76dbdd |
|
|
|
76dbdd |
Cloud-init's main.py will fail when presented with a new
|
|
|
76dbdd |
stage name 'modules-init' if upgrading an older cloud-init.
|
|
|
76dbdd |
Fix this by initializing unknown stage names before accessing.
|
|
|
76dbdd |
|
|
|
76dbdd |
LP: #1815109
|
|
|
76dbdd |
|
|
|
76dbdd |
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
|
76dbdd |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
76dbdd |
---
|
|
|
76dbdd |
cloudinit/cmd/main.py | 9 +++++----
|
|
|
76dbdd |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
76dbdd |
|
|
|
76dbdd |
diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py
|
|
|
76dbdd |
index 933c019..a5446da 100644
|
|
|
76dbdd |
--- a/cloudinit/cmd/main.py
|
|
|
76dbdd |
+++ b/cloudinit/cmd/main.py
|
|
|
76dbdd |
@@ -632,13 +632,14 @@ def status_wrapper(name, args, data_d=None, link_d=None):
|
|
|
76dbdd |
'start': None,
|
|
|
76dbdd |
'finished': None,
|
|
|
76dbdd |
}
|
|
|
76dbdd |
+
|
|
|
76dbdd |
if status is None:
|
|
|
76dbdd |
status = {'v1': {}}
|
|
|
76dbdd |
- for m in modes:
|
|
|
76dbdd |
- status['v1'][m] = nullstatus.copy()
|
|
|
76dbdd |
status['v1']['datasource'] = None
|
|
|
76dbdd |
- elif mode not in status['v1']:
|
|
|
76dbdd |
- status['v1'][mode] = nullstatus.copy()
|
|
|
76dbdd |
+
|
|
|
76dbdd |
+ for m in modes:
|
|
|
76dbdd |
+ if m not in status['v1']:
|
|
|
76dbdd |
+ status['v1'][m] = nullstatus.copy()
|
|
|
76dbdd |
|
|
|
76dbdd |
v1 = status['v1']
|
|
|
76dbdd |
v1['stage'] = mode
|
|
|
76dbdd |
--
|
|
|
76dbdd |
1.8.3.1
|
|
|
76dbdd |
|