From f85a8b6264a8a086bc0a96a3a7f2b16fb61b6559 Mon Sep 17 00:00:00 2001
From: cclhsu <clark.hsu@suse.com>
Date: Fri, 23 Oct 2020 18:08:06 +0800
Subject: [PATCH] Add command update

---
 ci/infra/azure/cloud-init.tf                  | 19 +++++++++++++------
 ci/infra/azure/cloud-init/cloud-init.yaml.tpl |  2 +-
 ci/infra/azure/cloud-init/commands.tpl        |  6 ++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/ci/infra/azure/cloud-init.tf b/ci/infra/azure/cloud-init.tf
index aa3aa740ff..6d790505fc 100644
--- a/ci/infra/azure/cloud-init.tf
+++ b/ci/infra/azure/cloud-init.tf
@@ -5,8 +5,14 @@ data "template_file" "repositories" {
   template = file("${path.module}/cloud-init/repository.tpl")
 
   vars = {
-    repository_url  = element(values(var.repositories), count.index)
-    repository_name = element(keys(var.repositories), count.index)
+    repository_url  = element(
+      values(var.repositories), 
+      count.index
+    )
+    repository_name = element(
+      keys(var.repositories), 
+      count.index
+    )
   }
 }
 
@@ -16,6 +22,7 @@ data "template_file" "register_scc" {
 
   vars = {
     caasp_registry_code = var.caasp_registry_code
+    rmt_server_name     = var.rmt_server_name
   }
 }
 
@@ -42,7 +49,7 @@ data "template_file" "commands" {
   template = file("${path.module}/cloud-init/commands.tpl")
 
   vars = {
-    packages = join(", ", var.packages)
+    packages = join(" ", var.packages)
   }
 }
 
@@ -51,9 +58,9 @@ data "template_file" "cloud-init" {
 
   vars = {
     authorized_keys = join("\n", formatlist("  - %s", var.authorized_keys))
-    register_scc    = join("\n", data.template_file.register_scc.*.rendered)
-    register_rmt    = join("\n", data.template_file.register_rmt.*.rendered)
-    register_suma   = join("\n", data.template_file.register_suma.*.rendered)
+    register_scc    = var.caasp_registry_code != "" && var.rmt_server_name == "" ? join("\n", data.template_file.register_scc.*.rendered) : ""
+    register_rmt    = var.rmt_server_name != "" ? join("\n", data.template_file.register_rmt.*.rendered) : ""
+    register_suma   = var.suma_server_name != "" ? join("\n", data.template_file.register_suma.*.rendered) : ""
     repositories    = length(var.repositories) == 0 ? "\n" : join("\n", data.template_file.repositories.*.rendered)
     commands        = join("\n", data.template_file.commands.*.rendered)
   }
diff --git a/ci/infra/azure/cloud-init/cloud-init.yaml.tpl b/ci/infra/azure/cloud-init/cloud-init.yaml.tpl
index 63873ca633..eb8c514608 100644
--- a/ci/infra/azure/cloud-init/cloud-init.yaml.tpl
+++ b/ci/infra/azure/cloud-init/cloud-init.yaml.tpl
@@ -13,7 +13,7 @@ ${authorized_keys}
 # WARNING!!! Do not use cloud-init packages module when SUSE CaaSP Registration
 # Code is provided. In this case, repositories will be added in runcmd module
 # with SUSEConnect command after packages module is ran
-#packages:
+# packages:
 
 bootcmd:
   - ip link set dev eth0 mtu 1500
diff --git a/ci/infra/azure/cloud-init/commands.tpl b/ci/infra/azure/cloud-init/commands.tpl
index bd04873d83..d6b5b084fb 100644
--- a/ci/infra/azure/cloud-init/commands.tpl
+++ b/ci/infra/azure/cloud-init/commands.tpl
@@ -1,2 +1,4 @@
-  - echo "solver.onlyRequires = true" >> /etc/zypp/zypp.conf
-  - zypper -n install ${packages}
\ No newline at end of file
+# FIXME: wait to prevent race condition that makes zypper install to fail
+# retriving metadata from repositories
+  - sleep 30
+  - zypper --non-interactive --ignore-unknown install ${packages}