From 3b0e8e29607806b0c408dc2774f7b08336e770aa Mon Sep 17 00:00:00 2001 From: Volker Theile Date: Thu, 9 Jul 2020 12:41:49 +0200 Subject: [PATCH] mgr/cephadm: Adapt Vagrantbox to el8 After el7 has been dropped with https://github.com/ceph/ceph/pull/35722 the Vagrantbox need to be adapted to el8. Signed-off-by: Volker Theile (cherry picked from commit d8623ff67bb57ecb3e7b0ae814ea21f1fda54c9b) Conflicts: src/pybind/mgr/cephadm/Vagrantfile --- src/pybind/mgr/cephadm/Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/Vagrantfile b/src/pybind/mgr/cephadm/Vagrantfile index 4528e75c2c3ee..be1992a23ec98 100644 --- a/src/pybind/mgr/cephadm/Vagrantfile +++ b/src/pybind/mgr/cephadm/Vagrantfile @@ -26,7 +26,7 @@ DISKS = getConfig('DISKS', 2) Vagrant.configure("2") do |config| config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.network "private_network", type: "dhcp" - config.vm.box = "centos/7" + config.vm.box = "centos/8" (0..MONS - 1).each do |i| config.vm.define "mon#{i}" do |mon| @@ -58,9 +58,9 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL sudo yum install -y yum-utils - sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm sudo rpm --import 'https://download.ceph.com/keys/release.asc' - curl -L https://shaman.ceph.com/api/repos/ceph/octopus/latest/centos/7/repo/ | sudo tee /etc/yum.repos.d/shaman.repo + curl -L https://shaman.ceph.com/api/repos/ceph/octopus/latest/centos/8/repo/ | sudo tee /etc/yum.repos.d/shaman.repo sudo yum install -y python36 podman ceph SHELL end -- 2.39.5