From c621ee3ee02bcd7376c22336df321ae8dd561f56 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 9 Jan 2023 09:16:57 +0000 Subject: [PATCH] fix(core): DPDK stuff Signed-off-by: pmikus Change-Id: I276cbfe4f761ddb4ccc652a276be2614adc6117e --- fdio.infra.ansible/roles/common/tasks/main.yaml | 1 + .../terraform-aws-fdio-csit-dash-app-base/variables.tf | 2 +- .../terraform-aws-fdio-csit-dash-app-base/versions.tf | 2 +- resources/libraries/bash/function/gather.sh | 7 ++++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fdio.infra.ansible/roles/common/tasks/main.yaml b/fdio.infra.ansible/roles/common/tasks/main.yaml index 7d9def96df..e47a1fc7a8 100644 --- a/fdio.infra.ansible/roles/common/tasks/main.yaml +++ b/fdio.infra.ansible/roles/common/tasks/main.yaml @@ -31,6 +31,7 @@ ansible.builtin.pip: name: - "meson==0.64.1" + state: "forcereinstall" tags: - common-inst-meson diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf index d3f0eabbd2..cfa9c3ecd8 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf @@ -7,7 +7,7 @@ variable "region" { variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://10.30.51.24:8200" + default = "http://vault.service.consul:8200" } variable "vault_provider_skip_tls_verify" { diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf index d3a7e8ea9e..1d5fd15e82 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf @@ -1,6 +1,6 @@ terraform { backend "consul" { - address = "10.30.51.24:8500" + address = "consul.service.consul:8500" scheme = "http" path = "terraform/app-base" } diff --git a/resources/libraries/bash/function/gather.sh b/resources/libraries/bash/function/gather.sh index 4958e5251b..afe7345f6e 100644 --- a/resources/libraries/bash/function/gather.sh +++ b/resources/libraries/bash/function/gather.sh @@ -1,5 +1,5 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. -# Copyright (c) 2021 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2023 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -92,7 +92,8 @@ function gather_dpdk () { then echo "Downloading latest DPDK packages from repo..." # URL is not in quotes, calling command from variable keeps them. - wget_command=("wget" "--no-check-certificate" "-nv" "-O" "-") + wget_command=("wget" "--no-check-certificate" "--compression=auto") + wget_command+=("-nv" "-O" "-") wget_command+=("${dpdk_repo}") dpdk_stable_ver="$("${wget_command[@]}" | grep -v "2015"\ | grep -Eo 'dpdk-[^\"]+xz' | tail -1)" || { -- 2.16.6