[CODESEARCH] Drop ssh authentication for Gerrit endpoint

Getting repo list does not require authentication so dropping it.

Since create_config.py "--git" option was reworked it will now
generate repo urls leveraging git protocol and git.onap.org service.

Change-Id: I2d36392ea36016ee09e05417608fd5871fa0c074
Issue-ID: INT-1940
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

diff --git a/bootstrap/codesearch/Vagrantfile b/bootstrap/codesearch/Vagrantfile
index af2d4a0..4c77309 100644 (file)
--- a/bootstrap/codesearch/Vagrantfile
+++ b/bootstrap/codesearch/Vagrantfile
@@ -5,12 +5,7 @@ host_ip = "192.168.121.1"
 synced_folder = "/vagrant"
 houndd_bin = "${HOME}/go/bin/houndd"
 houndd_config = "${HOME}/config.json"
-key_file = "${HOME}/.ssh/id_rsa"
-api_base = "https://gerrit.onap.org/r"
-api_user = ENV.fetch('API_USER') { |user| abort("missing env: #{user}") }
-api_key = ENV.fetch('API_KEY') { |key| abort("missing env: #{key}") }
 onap_git = "git.onap.org"
-gerrit_port = "29418"
 
 $replace_dns = <<-SCRIPT
   HOST_IP="$1"
@@ -18,35 +13,11 @@ $replace_dns = <<-SCRIPT
   echo nameserver "$HOST_IP" | tee /etc/resolv.conf
 SCRIPT
 
-$generate_key = <<-SCRIPT
-  KEY_FILE="$1"
-  echo "Generating SSH key (${KEY_FILE})"
-  ssh-keygen -q -b 4096 -t rsa -f "$KEY_FILE" -N ""
-SCRIPT
-
-$upload_key = <<-SCRIPT
-  KEY_FILE="$1"
-  API_BASE="$2"
-  echo "Uploading SSH pubkey (${KEY_FILE}.pub) for user: ${API_USER}"
-  curl -sS \
-       -u "${API_USER}:${API_KEY}" \
-       -d "@${KEY_FILE}.pub" \
-       -H "Content-Type: text/plain" \
-       -X POST "${API_BASE}/a/accounts/${API_USER}/sshkeys"
-SCRIPT
-
 Vagrant.configure("2") do |config|
   config.vm.box = "generic/ubuntu2004"
   config.vm.synced_folder ".", synced_folder, type: "rsync", rsync__exclude: "Vagrantfile"
   config.vm.network "forwarded_port", guest: 6080, host: 6080
   config.vm.provision "replace_dns", type: :shell, run: "always", inline: $replace_dns, args: host_ip
-  config.vm.provision "generate_key", type: :shell, privileged: false, inline: $generate_key, args: key_file
-  config.vm.provision "upload_key", type: :shell do |s|
-    s.privileged = false
-    s.inline = $upload_key
-    s.args = [key_file, api_base]
-    s.env = {'API_USER': api_user, 'API_KEY': api_key}
-  end
   config.vm.provision "dependencies", type: :shell, inline: <<-SHELL
     export DEBIAN_FRONTEND=noninteractive
     apt-get update
@@ -58,8 +29,8 @@ Vagrant.configure("2") do |config|
   SHELL
   config.vm.provision "generate_config", type: :shell do |s|
     s.privileged = false
-    s.inline = "python3 #{synced_folder}/create_config.py --ssh ${1} ${2} --git ${3} > #{houndd_config}"
-    s.args = [api_user, gerrit_port, onap_git]
+    s.inline = "python3 #{synced_folder}/create_config.py --git ${1} > #{houndd_config}"
+    s.args = [onap_git]
   end
   config.vm.provision "run_codesearch", type: :shell, privileged: false, inline: <<-SHELL
     tmux new -d -s codesearch #{houndd_bin} -conf #{houndd_config}