From: Joshua Schmid <jschmid@suse.de>
Date: Thu, 7 Nov 2019 09:23:58 +0000 (+0100)
Subject: mgr/ssh: adapt vagrantfile for ssh-orchestration bootstrap
X-Git-Tag: v15.1.0~992^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b014aae29f7d5f9eb3fb8e1298dbc20b62b0cf08;p=ceph.git

mgr/ssh: adapt vagrantfile for ssh-orchestration bootstrap

Signed-off-by: Joshua Schmid <jschmid@suse.de>
---

diff --git a/src/pybind/mgr/ssh/Vagrantfile b/src/pybind/mgr/ssh/Vagrantfile
index 0a2a63891ca1..84644ffd3d27 100644
--- a/src/pybind/mgr/ssh/Vagrantfile
+++ b/src/pybind/mgr/ssh/Vagrantfile
@@ -26,6 +26,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell" do |s|
     ssh_pub_key = File.readlines("#{Dir.home}/.ssh/id_rsa.pub").first.strip
     s.inline = "echo #{ssh_pub_key} >> /home/vagrant/.ssh/authorized_keys"
+    s.inline = "sudo cp -r /home/vagrant/.ssh /root/.ssh"
   end
 
   config.vm.provision "shell", inline: <<-SHELL
@@ -33,7 +34,7 @@ Vagrant.configure("2") do |config|
     sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
     sudo rpm --import 'https://download.ceph.com/keys/release.asc'
     curl -L https://shaman.ceph.com/api/repos/ceph/master/latest/centos/7/repo/ | sudo tee /etc/yum.repos.d/shaman.repo
-    sudo yum install -y ceph python36
-    sudo ln -s /usr/bin/python36 /usr/bin/python3
+    sudo yum install -y python36 podman ceph
+    sudo ln -s /usr/bin/python36 /usr/bin/python3 || true
   SHELL
 end