From 34e5932d0db1d3aeeed962df176d3b635018e641 Mon Sep 17 00:00:00 2001 From: Pawel Wieczorek Date: Fri, 26 Jul 2019 13:29:50 +0200 Subject: k8s: Silence download utilities This patch intends to make virtual environment creation logs more readable. Parameters were chosen in a way errors will still be shown the operator. This patch might also prove itself useful in other virtual environment creation tools such as 'devtool' [1] (unless maintainers insist on having full logs). [1] https://git.onap.org/integration/devtool Issue-ID: SECCOM-235 Change-Id: I5e07b1b1ed37d36470c18ba0cfe653e40eff300b Signed-off-by: Pawel Wieczorek --- test/security/k8s/tools/config/dot_curlrc | 8 ++++++++ test/security/k8s/tools/config/dot_wgetrc | 2 ++ test/security/k8s/vagrant/dublin/Vagrantfile | 11 +++++++++++ 3 files changed, 21 insertions(+) create mode 100644 test/security/k8s/tools/config/dot_curlrc create mode 100644 test/security/k8s/tools/config/dot_wgetrc (limited to 'test') diff --git a/test/security/k8s/tools/config/dot_curlrc b/test/security/k8s/tools/config/dot_curlrc new file mode 100644 index 000000000..ecf9792f5 --- /dev/null +++ b/test/security/k8s/tools/config/dot_curlrc @@ -0,0 +1,8 @@ +# Disable progress meter +--silent +# Show error messages +--show-error +# Fail silently on server errors +--fail +# Follow redirections +--location diff --git a/test/security/k8s/tools/config/dot_wgetrc b/test/security/k8s/tools/config/dot_wgetrc new file mode 100644 index 000000000..ac472b77a --- /dev/null +++ b/test/security/k8s/tools/config/dot_wgetrc @@ -0,0 +1,2 @@ +# Turn off output +quiet = on diff --git a/test/security/k8s/vagrant/dublin/Vagrantfile b/test/security/k8s/vagrant/dublin/Vagrantfile index abef9f8a1..e7fe6b1ec 100644 --- a/test/security/k8s/vagrant/dublin/Vagrantfile +++ b/test/security/k8s/vagrant/dublin/Vagrantfile @@ -16,6 +16,12 @@ cluster = [ all = cluster.dup << operation +$link_dotfiles = <<-SCRIPT + for rc in /vagrant/dot_*; do + ln -sf "$rc" "${HOME}/.${rc##*dot_}" + done +SCRIPT + Vagrant.configure('2') do |config| all.each do |machine| config.vm.define machine[:name] do |config| @@ -50,6 +56,11 @@ Vagrant.configure('2') do |config| end if machine[:name] == 'operator' + config.vm.synced_folder "../../tools/config", "/vagrant", type: "rsync" + + config.vm.provision :shell, run: "always", inline: $link_dotfiles + config.vm.provision :shell, run: "always", privileged: false, inline: $link_dotfiles + config.vm.provision :shell, path: "../../tools/dublin/get_rke.sh" config.vm.provision :shell, inline: <<-SHELL -- cgit 1.2.3-korg