From fc7d59c7819356ff085bfd5c996f6e5db8a5ce9a Mon Sep 17 00:00:00 2001 From: Maxime Noel <55169628+maximenoel8@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:09:21 +1300 Subject: [PATCH] Update suse manager VM pipeline (#1494) --- .../tf_files/SUSEManager-4.3-VM-NUE.tf | 36 +++++-------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/terracumber_config/tf_files/SUSEManager-4.3-VM-NUE.tf b/terracumber_config/tf_files/SUSEManager-4.3-VM-NUE.tf index 91f31690a..5c9081009 100644 --- a/terracumber_config/tf_files/SUSEManager-4.3-VM-NUE.tf +++ b/terracumber_config/tf_files/SUSEManager-4.3-VM-NUE.tf @@ -144,43 +144,33 @@ module "cucumber_testsuite" { vcpu = 2 memory = 2048 } - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } - suse-client = { + suse_client = { image = "sles15sp4o" - name = "cli-sles15" provider_settings = { mac = "aa:b2:93:01:00:84" vcpu = 2 memory = 2048 } } - suse-minion = { + suse_minion = { image = "sles15sp4o" - name = "min-sles15" provider_settings = { mac = "aa:b2:93:01:00:86" vcpu = 2 memory = 2048 } - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } - suse-sshminion = { + suse_sshminion = { image = "sles15sp4o" - name = "minssh-sles15" provider_settings = { mac = "aa:b2:93:01:00:88" vcpu = 2 memory = 2048 } - additional_packages = [ "venv-salt-minion", "iptables" ] - install_salt_bundle = true } - redhat-minion = { + rhlike_minion = { image = "centos7o" - name = "min-centos7" provider_settings = { mac = "aa:b2:93:01:00:89" // Since start of May we have problems with the instance not booting after a restart if there is only a CPU and only 1024Mb for RAM @@ -188,47 +178,37 @@ module "cucumber_testsuite" { vcpu = 2 memory = 2048 } - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } - debian-minion = { + deblike_minion = { image = "ubuntu2204o" - name = "min-ubuntu2204" provider_settings = { mac = "aa:b2:93:01:00:8b" vcpu = 2 memory = 2048 } - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } - build-host = { + build_host = { image = "sles15sp4o" provider_settings = { mac = "aa:b2:93:01:00:8d" vcpu = 4 memory = 8192 } - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } - pxeboot-minion = { + pxeboot_minion = { image = "sles15sp4o" provider_settings = { vcpu = 2 memory = 2048 } } - kvm-host = { + kvm_host = { image = "sles15sp4o" - name = "min-kvm" provider_settings = { mac = "aa:b2:93:01:00:8e" vcpu = 4 memory = 8192 } - additional_packages = [ "venv-salt-minion" ] - install_salt_bundle = true } }