[ARVADOS] created: 2.1.0-718-g69b739e34

[Git user]

        at  69b739e3428907392746f91fd14e77a94bb4a8ce (commit)


commit 69b739e3428907392746f91fd14e77a94bb4a8ce
Author: Javier Bértoli <jbertoli at curii.com>
Date:   Wed Apr 21 12:01:30 2021 -0300

    fix(provision): remove unneeded vagantfile
    
    refs #17570
    Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>

diff --git a/tools/salt-install/.gitignore b/tools/salt-install/.gitignore
index df7452e2c..55096af73 100644
--- a/tools/salt-install/.gitignore
+++ b/tools/salt-install/.gitignore
@@ -1,2 +1,3 @@
 local_config_dir
 local.params
+*pem
diff --git a/tools/salt-install/Vagrantfile.single_host_single_hostname.example b/tools/salt-install/Vagrantfile.single_host_single_hostname.example
deleted file mode 100644
index 666c6c48f..000000000
--- a/tools/salt-install/Vagrantfile.single_host_single_hostname.example
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-# Vagrantfile API/syntax version. Don"t touch unless you know what you"re doing!
-VAGRANTFILE_API_VERSION = "2".freeze
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.ssh.insert_key = false
-  config.ssh.forward_x11 = true
-
-  # A single_host multiple_hostnames example
-  config.vm.define "arvados-sh-mn" do |arv|
-    arv.vm.box = "bento/debian-10"
-    arv.vm.hostname = "harpo.local"
-    # CPU/RAM
-    config.vm.provider :virtualbox do |v|
-      v.memory = 2048
-      v.cpus = 2
-    end
-
-    # Networking
-    # WEBUI PORT
-    arv.vm.network "forwarded_port", guest: 8443, host: 8443
-    # KEEPPROXY
-    arv.vm.network "forwarded_port", guest: 25101, host: 25101
-    # KEEPWEB
-    arv.vm.network "forwarded_port", guest: 9002, host: 9002
-    # WEBSOCKET
-    arv.vm.network "forwarded_port", guest: 8002, host: 8002
-    arv.vm.provision "shell",
-                     inline: "sed 's#fixme#harpo#g;
-                                   s#CONTROLLER_EXT_SSL_PORT=443#CONTROLLER_EXT_SSL_PORT=8443#g' \
-                                   /vagrant/local.params.example > /vagrant/local.params.single_host_multiple_hostnames"
-    arv.vm.provision "shell",
-                     path: "provision.sh",
-                     args: [
-                       # "--debug",
-                       "--config /vagrant/local.params.single_host_multiple_hostnames",
-                       "--test",
-                       "--vagrant"
-                     ].join(" ")
-  end
-
-  ## # A single_host single_hostname example
-  ## config.vm.define "arvados-sh-sn" do |arv|
-  ##   arv.vm.box = "bento/debian-10"
-  ##   arv.vm.hostname = "zeppo.local"
-  ##   # CPU/RAM
-  ##   config.vm.provider :virtualbox do |v|
-  ##     v.memory = 2048
-  ##     v.cpus = 2
-  ##   end
-
-  ##   # Networking
-  ##   arv.vm.network "forwarded_port", guest: 9443, host: 9443
-  ##   arv.vm.network "forwarded_port", guest: 9444, host: 9444
-  ##   arv.vm.network "forwarded_port", guest: 9445, host: 9445
-  ##   arv.vm.network "forwarded_port", guest: 35101, host: 35101
-  ##   arv.vm.network "forwarded_port", guest: 10002, host: 10002
-  ##   arv.vm.network "forwarded_port", guest: 14202, host: 14202
-  ##   arv.vm.network "forwarded_port", guest: 18002, host: 18002
-  ##   arv.vm.provision "shell",
-  ##                    inline: "sed 's#HOSTNAME_EXT=\"\"#HOSTNAME_EXT=\"zeppo.local.cluster\"#g;
-  ##                                  s#CLUSTER=\"fixme\"#CLUSTER=\"zeppo\"#g;
-  ##                                  s#DOMAIN=\"some.domain\"#DOMAIN=\"local.cluster\"#g;
-  ##                                  s#CONFIG_DIR=\"config_examples/single_host/multiple_hostnames\"#CONFIG_DIR=\"config_examples/single_host/single_hostname\"#g;
-  ##                                  s#CONTROLLER_EXT_SSL_PORT=443#CONTROLLER_EXT_SSL_PORT=9443#g;
-  ##                                  s#KEEP_EXT_SSL_PORT=25101#KEEP_EXT_SSL_PORT=35101#g;
-  ##                                  s#KEEPWEB_EXT_SSL_PORT=9002#KEEPWEB_EXT_SSL_PORT=11002#g;
-  ##                                  s#WEBSHELL_EXT_SSL_PORT=4202#WEBSHELL_EXT_SSL_PORT=14202#g;
-  ##                                  s#WEBSOCKET_EXT_SSL_PORT=8002#WEBSOCKET_EXT_SSL_PORT=18002#g;
-  ##                                  s#WORKBENCH1_EXT_SSL_PORT=443#WORKBENCH1_EXT_SSL_PORT=9444#g;
-  ##                                  s#WORKBENCH2_EXT_SSL_PORT=3001#WORKBENCH2_EXT_SSL_PORT=9445#g;' \
-  ##                                 /vagrant/local.params.example > /vagrant/local.params.single_host_single_hostname"
-  ##   arv.vm.provision "shell",
-  ##                    path: "provision.sh",
-  ##                    args: [
-  ##                      # "--debug",
-  ##                      "--config /vagrant/local.params.single_host_single_hostname",
-  ##                      "--test",
-  ##                      "--vagrant"
-  ##                    ].join(" ")
-  ## end
-end

-----------------------------------------------------------------------


hooks/post-receive
--