]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #35991 from votdev/adapt_cephadm_vagrantbox_to_el8
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 15 Jul 2020 10:46:58 +0000 (12:46 +0200)
committerGitHub <noreply@github.com>
Wed, 15 Jul 2020 10:46:58 +0000 (12:46 +0200)
mgr/cephadm: Adapt Vagrantbox to el8

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
1  2 
src/pybind/mgr/cephadm/Vagrantfile

index 01bc463782d8429aedef4051f4853956f818a776,e613c4062414ea2ab129bf3086dda8784dc9d8c8..3a08380c305d569e55259775a25ef594391e41e6
@@@ -26,9 -5,9 +26,9 @@@ 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..NUM_DAEMONS - 1).each do |i|
 +  (0..MONS - 1).each do |i|
      config.vm.define "mon#{i}" do |mon|
        mon.vm.hostname = "mon#{i}"
      end
  
    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/master/latest/centos/7/repo/ | sudo tee /etc/yum.repos.d/shaman.repo
+     curl -L https://shaman.ceph.com/api/repos/ceph/master/latest/centos/8/repo/ | sudo tee /etc/yum.repos.d/shaman.repo
      sudo yum install -y python36 podman ceph
 -    sudo ln -s /usr/bin/python36 /usr/bin/python3 || true
    SHELL
  end