Skip to content

Commit

Permalink
Add command update
Browse files Browse the repository at this point in the history
  • Loading branch information
cclhsu committed Oct 23, 2020
1 parent b4c1d43 commit f85a8b6
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
19 changes: 13 additions & 6 deletions ci/infra/azure/cloud-init.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}
}

Expand All @@ -16,6 +22,7 @@ data "template_file" "register_scc" {

vars = {
caasp_registry_code = var.caasp_registry_code
rmt_server_name = var.rmt_server_name
}
}

Expand All @@ -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)
}
}

Expand All @@ -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)
}
Expand Down
2 changes: 1 addition & 1 deletion ci/infra/azure/cloud-init/cloud-init.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions ci/infra/azure/cloud-init/commands.tpl
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
- echo "solver.onlyRequires = true" >> /etc/zypp/zypp.conf
- zypper -n install ${packages}
# 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}

0 comments on commit f85a8b6

Please sign in to comment.