]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/ssh: adapt vagrantfile for ssh-orchestration bootstrap
authorJoshua Schmid <jschmid@suse.de>
Thu, 7 Nov 2019 09:23:58 +0000 (10:23 +0100)
committerJoshua Schmid <jschmid@suse.de>
Thu, 7 Nov 2019 09:23:58 +0000 (10:23 +0100)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
src/pybind/mgr/ssh/Vagrantfile

index 0a2a63891ca13b12608ff66778403c85d2c8147f..84644ffd3d274c151fbc1aac13ca865a063b4e38 100644 (file)
@@ -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