Skip to content

Commit 5503269

Browse files
srbarriossrbarrios
authored
Revert zypper in clout init (#1704)
* Revert "Non interactive zypper install (#1703)" This reverts commit 151e663. * Revert "Refactor the usage of packages keyword in cloud-init, to avoid auto upgrade of packages (#1702)" This reverts commit dc84479.
1 parent 151e663 commit 5503269

File tree

1 file changed

+45
-90
lines changed

1 file changed

+45
-90
lines changed

‎backend_modules/libvirt/host/user_data.yaml‎

Lines changed: 45 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ zypper:
2020
name: tools_pool_repo
2121
# For openSUSE Tumbleweed venv-salt-minion is not available.
2222
# The goal is to be able to run Salt Shaker tests for the classic Salt package in Tumbleweed.
23-
runcmd:
24-
- zypper -n in salt salt-minion avahi avahi-lang
23+
packages: ["salt", "salt-minion", "avahi", "avahi-lang"]
2524
%{endif}
2625

2726
%{ if image == "centos7o" }
@@ -49,11 +48,9 @@ yum_repos:
4948
name: epel
5049

5150
%{ if install_salt_bundle }
52-
runcmd:
53-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
51+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
5452
%{ else }
55-
runcmd:
56-
- zypper -n in salt-minion avahi nss-mdns qemu-guest-agent
53+
packages: ["salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
5754
%{ endif }
5855
%{ endif }
5956

@@ -91,11 +88,9 @@ yum_repos:
9188
name: CentOS-AppStream_backup
9289

9390
%{ if install_salt_bundle }
94-
runcmd:
95-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
91+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
9692
%{ else }
97-
runcmd:
98-
- zypper -n in salt-minion avahi nss-mdns qemu-guest-agent
93+
packages: ["salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
9994
%{ endif }
10095
%{ endif }
10196

@@ -133,11 +128,9 @@ yum_repos:
133128
name: CentOS-AppStream_backup
134129

135130
%{ if install_salt_bundle }
136-
runcmd:
137-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
131+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
138132
%{ else }
139-
runcmd:
140-
- zypper -n in salt-minion avahi nss-mdns qemu-guest-agent
133+
packages: ["salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
141134
%{ endif }
142135
%{ endif }
143136

@@ -151,11 +144,9 @@ zypper:
151144
name: tools_pool_repo
152145

153146
%{ if install_salt_bundle }
154-
runcmd:
155-
- zypper -n in venv-salt-minion avahi nss-mdns
147+
packages: ["venv-salt-minion", "avahi", "nss-mdns"]
156148
%{ else }
157-
runcmd:
158-
- zypper -n in avahi nss-mdns
149+
packages: ["avahi", "nss-mdns"]
159150
%{ endif }
160151

161152
runcmd:
@@ -177,11 +168,9 @@ zypper:
177168
name: tools_pool_repo
178169

179170
%{ if install_salt_bundle }
180-
runcmd:
181-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
171+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
182172
%{ else }
183-
runcmd:
184-
- zypper -n in avahi nss-mdns qemu-guest-agent
173+
packages: ["avahi", "nss-mdns", "qemu-guest-agent"]
185174
%{ endif }
186175
%{ endif }
187176

@@ -205,11 +194,9 @@ zypper:
205194
name: tools_pool_repo
206195

207196
%{ if install_salt_bundle }
208-
runcmd:
209-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
197+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
210198
%{ else }
211-
runcmd:
212-
- zypper -n in avahi nss-mdns qemu-guest-agent
199+
packages: ["avahi", "nss-mdns", "qemu-guest-agent"]
213200
%{ endif }
214201

215202
runcmd:
@@ -232,11 +219,9 @@ zypper:
232219
name: tools_pool_repo
233220

234221
%{ if install_salt_bundle }
235-
runcmd:
236-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
222+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
237223
%{ else }
238-
runcmd:
239-
- zypper -n in avahi nss-mdns qemu-guest-agent
224+
packages: ["avahi", "nss-mdns", "qemu-guest-agent"]
240225
%{ endif }
241226

242227
runcmd:
@@ -259,11 +244,9 @@ zypper:
259244
name: tools_pool_repo
260245

261246
%{ if install_salt_bundle }
262-
runcmd:
263-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
247+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
264248
%{ else }
265-
runcmd:
266-
- zypper -n in avahi nss-mdns qemu-guest-agent
249+
packages: ["avahi", "nss-mdns", "qemu-guest-agent"]
267250
%{ endif }
268251

269252
runcmd:
@@ -286,11 +269,9 @@ zypper:
286269
name: tools_pool_repo
287270

288271
%{ if install_salt_bundle }
289-
runcmd:
290-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
272+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
291273
%{ else }
292-
runcmd:
293-
- zypper -n in avahi nss-mdns qemu-guest-agent
274+
packages: ["avahi", "nss-mdns", "qemu-guest-agent"]
294275
%{ endif }
295276

296277
runcmd:
@@ -314,11 +295,9 @@ zypper:
314295
name: tools_pool_repo
315296

316297
%{ if install_salt_bundle }
317-
runcmd:
318-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
298+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
319299
%{ else }
320-
runcmd:
321-
- zypper -n in avahi nss-mdns qemu-guest-agent
300+
packages: ["avahi", "nss-mdns", "qemu-guest-agent"]
322301
%{ endif }
323302

324303
runcmd:
@@ -486,11 +465,9 @@ runcmd:
486465
- systemctl start qemu-guest-agent
487466

488467
%{ if install_salt_bundle }
489-
runcmd:
490-
- zypper -n in venv-salt-minion avahi-daemon qemu-guest-agent
468+
packages: ["venv-salt-minion", "avahi-daemon", "qemu-guest-agent"]
491469
%{ else }
492-
runcmd:
493-
- zypper -n in salt-minion avahi-daemon qemu-guest-agent
470+
packages: ["salt-minion", "avahi-daemon", "qemu-guest-agent"]
494471
%{ endif }
495472
%{ endif }
496473
%{ if image == "ubuntu2204o" }
@@ -531,11 +508,9 @@ runcmd:
531508
- systemctl start qemu-guest-agent
532509

533510
%{ if install_salt_bundle }
534-
runcmd:
535-
- zypper -n in venv-salt-minion avahi-daemon qemu-guest-agent
511+
packages: ["venv-salt-minion", "avahi-daemon", "qemu-guest-agent"]
536512
%{ else }
537-
runcmd:
538-
- zypper -n in salt-minion avahi-daemon qemu-guest-agent
513+
packages: ["salt-minion", "avahi-daemon", "qemu-guest-agent"]
539514
%{ endif }
540515
%{ endif }
541516
%{ if image == "debian12o" }
@@ -578,11 +553,9 @@ bootcmd:
578553
- DEBIAN_FRONTEND=noninteractive apt-get -yq install gnupg
579554

580555
%{ if install_salt_bundle }
581-
runcmd:
582-
- zypper -n in venv-salt-minion avahi-daemon qemu-guest-agent gnupg
556+
packages: ["venv-salt-minion", "avahi-daemon", "qemu-guest-agent", "gnupg"]
583557
%{ else }
584-
runcmd:
585-
- zypper -n in salt-minion avahi-daemon qemu-guest-agent gnupg
558+
packages: ["salt-minion", "avahi-daemon", "qemu-guest-agent", "gnupg"]
586559
%{ endif }
587560
%{ endif }
588561
%{ if image == "debian11o" }
@@ -627,11 +600,9 @@ bootcmd:
627600
- DEBIAN_FRONTEND=noninteractive apt-get -yq install gnupg
628601

629602
%{ if install_salt_bundle }
630-
runcmd:
631-
- zypper -n in venv-salt-minion avahi-daemon qemu-guest-agent gnupg python3-apt
603+
packages: ["venv-salt-minion", "avahi-daemon", "qemu-guest-agent", "gnupg", "python3-apt"]
632604
%{ else }
633-
runcmd:
634-
- zypper -n in salt-minion avahi-daemon qemu-guest-agent gnupg python3-apt
605+
packages: ["salt-minion", "avahi-daemon", "qemu-guest-agent", "gnupg", "python3-apt"]
635606
%{ endif }
636607
%{ endif }
637608

@@ -655,11 +626,9 @@ yum_repos:
655626
name: epel
656627

657628
%{ if install_salt_bundle }
658-
runcmd:
659-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
629+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
660630
%{ else }
661-
runcmd:
662-
- zypper -n in salt-minion avahi nss-mdns qemu-guest-agent
631+
packages: ["salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
663632
%{ endif }
664633

665634
%{ endif }
@@ -681,11 +650,9 @@ yum_repos:
681650
name: epel
682651

683652
%{ if install_salt_bundle }
684-
runcmd:
685-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
653+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
686654
%{ else }
687-
runcmd:
688-
- zypper -n in avahi nss-mdns qemu-guest-agent salt-minion
655+
packages: ["avahi", "nss-mdns", "qemu-guest-agent", "salt-minion"]
689656
%{ endif }
690657

691658
%{ endif }
@@ -712,11 +679,9 @@ runcmd:
712679
- systemctl restart sshd
713680

714681
%{ if install_salt_bundle }
715-
runcmd:
716-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent dbus-tools
682+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent", "dbus-tools"]
717683
%{ else }
718-
runcmd:
719-
- zypper -n in avahi nss-mdns qemu-guest-agent salt-minion dbus-tools
684+
packages: ["avahi", "nss-mdns", "qemu-guest-agent", "salt-minion", "dbus-tools"]
720685
%{ endif }
721686

722687
%{ endif }
@@ -762,11 +727,9 @@ yum_repos:
762727
name: epel
763728

764729
%{ if install_salt_bundle }
765-
runcmd:
766-
- zypper -n in venv-salt-minion avahi nss-mdns dbus-tools
730+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "dbus-tools"]
767731
%{ else }
768-
runcmd:
769-
- zypper -n in avahi nss-mdns salt-minion dbus-tools
732+
packages: ["avahi", "nss-mdns", "salt-minion", "dbus-tools"]
770733
%{ endif }
771734

772735
%{ endif }
@@ -793,11 +756,9 @@ runcmd:
793756
- systemctl restart sshd
794757

795758
%{ if install_salt_bundle }
796-
runcmd:
797-
- zypper -n in venv-salt-minion avahi nss-mdns dbus-tools
759+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "dbus-tools"]
798760
%{ else }
799-
runcmd:
800-
- zypper -n in avahi nss-mdns salt-minion dbus-tools
761+
packages: ["avahi", "nss-mdns", "salt-minion", "dbus-tools"]
801762
%{ endif }
802763
%{ endif }
803764

@@ -818,11 +779,9 @@ yum_repos:
818779
name: epel
819780

820781
%{ if install_salt_bundle }
821-
runcmd:
822-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent
782+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"]
823783
%{ else }
824-
runcmd:
825-
- zypper -n in avahi nss-mdns qemu-guest-agent salt-minion
784+
packages: ["avahi", "nss-mdns", "qemu-guest-agent", "salt-minion"]
826785
%{ endif }
827786

828787
%{ endif }
@@ -849,11 +808,9 @@ runcmd:
849808
- systemctl restart sshd
850809

851810
%{ if install_salt_bundle }
852-
runcmd:
853-
- zypper -n in venv-salt-minion avahi nss-mdns qemu-guest-agent dbus-tools tar
811+
packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent", "dbus-tools", "tar"]
854812
%{ else }
855-
runcmd:
856-
- zypper -n in salt-minion avahi nss-mdns qemu-guest-agent dbus-tools tar
813+
packages: ["avahi", "nss-mdns", "qemu-guest-agent", "salt-minion", "dbus-tools", "tar"]
857814
%{ endif }
858815

859816
%{ endif }
@@ -868,11 +825,9 @@ zypper:
868825
name: tools_pool_repo
869826

870827
%{ if install_salt_bundle }
871-
runcmd:
872-
- zypper -n in venv-salt-minion
828+
packages: ["venv-salt-minion"]
873829
%{ else }
874-
runcmd:
875-
- zypper -n in salt-minion
830+
packages: ["salt-minion"]
876831
%{ endif }
877832

878833
runcmd:

0 commit comments

Comments
 (0)