Skip to content

vagrant: Switch to CentOS Stream 10 and update provisioning #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chaudron wants to merge 1 commit into
base: main
Choose a base branch
from
Open

vagrant: Switch to CentOS Stream 10 and update provisioning #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions README_DEVELOPMENT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@ The following set of commands will re-size the image:
vagrant halt
qemu-img resize ~/.local/share/libvirt/images/ovn-fake-<XXX>.img +100G
vagrant up && vagrant ssh
echo ", +" | sudo sfdisk -N 1 /dev/vda --no-reread
sudo partprobe
sudo sudo xfs_growfs /
sudo growpart /dev/vda 2
sudo resize2fs /dev/vda2
exit
vagrant reload && vagrant ssh
```
Expand Down
4 changes: 2 additions & 2 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Vagrant.require_version ">=1.7.0"

$bootstrap_centos = <<SCRIPT
#dnf -y update ||: ; # save your time. "vagrant box update" is your friend
dnf -y install git time python3
dnf -y install cloud-utils-growpart git python3 time
SCRIPT

$build_images = <<SCRIPT
Expand All @@ -26,7 +26,7 @@ Vagrant.configure(2) do |config|
vm_cpus = ENV['VM_CPUS'] || '4'

config.vm.hostname = "ovnhostvm"
config.vm.box = "generic/rocky8"
config.vm.box = "centos/stream10"
config.vm.box_check_update = false

# config.vm.synced_folder "#{ENV['PWD']}", "/vagrant", sshfs_opts_append: "-o nonempty", disabled: false, type: "sshfs"
Expand Down
4 changes: 2 additions & 2 deletions provisioning/install_ovs_in_underlay.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
set -o xtrace
set -o errexit

dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
curl -L http://trunk.rdoproject.org/centos8/delorean-deps.repo | sudo tee /etc/yum.repos.d/delorean-deps.repo
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm
curl -L http://trunk.rdoproject.org/centos10/delorean-deps.repo | sudo tee /etc/yum.repos.d/delorean-deps.repo

##dnf install -y libibverbs
##dnf install -y openvswitch openvswitch-ovn-central openvswitch-ovn-host
Expand Down
2 changes: 1 addition & 1 deletion provisioning/start_traffic.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ tmux new -s traffic \; \
select-pane -t 7 \; \
send-keys 'podman exec -it ovn-chassis-1 ip netns exec sw01p3 ping 21.0.0.3 -t 1' C-m \; \
select-pane -t 8 \; \
send-keys 'podman exec -it ovn-chassis-1 ip netns exec sw01p1 bash -c "export TOOLBOX_HOME=/vagrant/bench-uperf_git/toolbox; export RS_CS_LABEL=1-1; export PATH=/vagrant/uperf_git/src:${PATH}; cp -rv /vagrant/bench-uperf_git/xml-files/ /tmp/; /vagrant/bench-uperf_git/uperf-client --test-type=rr --wsize=64 --rsize=1024 --duration=3600 --protocol=tcp --nthreads=1024 --remotehost=11.0.0.6"' C-m \;
send-keys 'podman exec -it ovn-chassis-1 ip netns exec sw01p1 bash -c "export TOOLBOX_HOME=/vagrant/bench-uperf_git/toolbox; export RS_CS_LABEL=1-1; export PATH=/vagrant/uperf_git/src:${PATH}; cp -rv /vagrant/bench-uperf_git/xml-files/ /tmp/; /vagrant/bench-uperf_git/uperf-client --test-type=rr --wsize=64 --rsize=1024 --duration=3600 --protocol=tcp --nthreads=128 --remotehost=11.0.0.6"' C-m \;
11 changes: 6 additions & 5 deletions setup_dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,10 @@ function check_system()
echo " vagrant halt"
echo " qemu-img resize ~/.local/share/libvirt/images/ovn-fake-<XXX>.img +100G"
echo " vagrant up && vagrant ssh"
echo " echo \", +\" | sudo sfdisk -N 1 /dev/vda --no-reread"
echo " sudo partprobe"
echo " sudo sudo xfs_growfs /"
echo " sudo growpart /dev/vda 2"
echo " sudo resize2fs /dev/vda2"
echo " exit"
echo " vagrant reload && vagrant ssh"
exit
fi

Expand Down Expand Up @@ -152,11 +153,10 @@ EOF
# NOTE: the rpcbind packages update takes long to complete!
function install_packages()
{
dnf config-manager --set-enabled powertools
dnf config-manager --set-enabled crb
dnf -y update
dnf install -y \
aspell \
aspell-en \
autoconf \
automake \
bc \
Expand Down Expand Up @@ -224,6 +224,7 @@ function install_uperf()

if ! [ -f "/vagrant/uperf_git/src/uperf" ]; then
cd /vagrant/uperf_git/ || exit
autoreconf --install
./configure
make -j "$(nproc)"
cd /vagrant/ || exit
Expand Down