Skip to content

Commit fe4d011

Browse files
authored
Dev: Drop rkt container type in bundle (jsc#PED-5577) (#1427)
2 parents 4dcac18 + 3cd89f4 commit fe4d011

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

crmsh/cibconfig.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ def fix_node_ids(node, oldnode):
687687
}
688688

689689
idless = set([
690-
'operations', 'fencing-topology', 'network', 'docker', 'podman', 'rkt',
690+
'operations', 'fencing-topology', 'network', 'docker', 'podman',
691691
'storage', 'select', 'select_attributes', 'select_fencing',
692692
'select_nodes', 'select_resources'
693693
])
@@ -1717,7 +1717,6 @@ class CibBundle(CibObject):
17171717
"meta_attributes": "meta",
17181718
"docker": "docker",
17191719
"podman": "podman",
1720-
"rkt": "rkt",
17211720
"network": "network",
17221721
"storage": "storage",
17231722
"primitive": "primitive",

crmsh/constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
"cluster-name")
274274
pcmk_version = "" # set later
275275

276-
container_type = ("docker", "podman", "rkt")
276+
container_type = ("docker", "podman")
277277
container_helptxt = {
278278
"container": {
279279
"image": """image:(string)
@@ -301,7 +301,7 @@
301301
(but could, for example, be a script that does other stuff, too).""",
302302

303303
"options": """options:(string)
304-
Extra command-line options to pass to the 'docker run', 'podman run' or 'rkt run' command"""
304+
Extra command-line options to pass to the 'docker run' or 'podman run' command"""
305305
},
306306

307307
"network": {

crmsh/parse.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ def match_arguments(self, out, name_map, implicit_initial=None, terminator=None)
629629
for op in oplist:
630630
del name_map[op]
631631
bundle_list = olist([op for op in name_map if op.lower()
632-
in ('docker', 'podman', 'rkt', 'network', 'port-mapping', 'storage', 'primitive')])
632+
in ('docker', 'podman', 'network', 'port-mapping', 'storage', 'primitive')])
633633
for bl in bundle_list:
634634
del name_map[bl]
635635
initial = True
@@ -979,7 +979,6 @@ def parse_bundle(self):
979979
xmlutil.maybe_set(out, 'description', self.try_match_description())
980980
self.match_arguments(out, {'docker': 'docker',
981981
'podman': 'podman',
982-
'rkt': 'rkt',
983982
'network': 'network',
984983
'port-mapping': 'port-mapping',
985984
'storage': 'storage',

doc/crm.8.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2660,10 +2660,9 @@ A bundle is a single resource specifying the settings, networking
26602660
requirements, and storage requirements for any number of containers
26612661
generated from the same container image.
26622662

2663-
Pacemaker bundles support Docker (since version 1.1.17) and rkt (since
2664-
version 1.1.18) container technologies.
2663+
Pacemaker bundles support Docker and Podman container technologies.
26652664

2666-
A bundle must contain exactly one +docker+ or +rkt+ element.
2665+
A bundle must contain exactly one +docker+ or +podman+ element.
26672666

26682667
The bundle definition may contain a reference to a primitive
26692668
resource which defining the resource running inside the

0 commit comments

Comments
 (0)