diff --git a/vagrant--devstack/Makefile b/vm-1.devstack/Makefile similarity index 100% rename from vagrant--devstack/Makefile rename to vm-1.devstack/Makefile diff --git a/vagrant--devstack/README.md b/vm-1.devstack/README.md similarity index 100% rename from vagrant--devstack/README.md rename to vm-1.devstack/README.md diff --git a/vagrant--devstack/Vagrantfile b/vm-1.devstack/Vagrantfile similarity index 50% rename from vagrant--devstack/Vagrantfile rename to vm-1.devstack/Vagrantfile index c7e0c29..7a55a7f 100644 --- a/vagrant--devstack/Vagrantfile +++ b/vm-1.devstack/Vagrantfile @@ -2,24 +2,24 @@ # frozen_string_literal: true Vagrant.configure('2') do |config| - config.vm.box = 'debian/bullseye64' + config.vm.box = 'debian/bookworm64' config.vm.provider 'libvirt' do |domain| - domain.memory = 18_000 + domain.memory = 12_000 domain.nested = true # domain.cpus = 2 end config.vm.provider 'virtualbox' do |vb| vb.gui = false - vb.memory = 18_000.to_s + vb.memory = 12_000.to_s # vb.nested = true vb.customize ['modifyvm', :id, '--nested-hw-virt', 'on'] end - # config.vm.synced_folder "..", "/vagrant" #, type: "nfs", mount_options: ['actimeo=2'] - # config.vm.synced_folder "../../exercises", "/vagrant/exercises" #, type: "nfs", mount_options: ['actimeo=2'] - # config.vm.synced_folder "../../config", "/vagrant/config" #, type: "nfs", mount_options: ['actimeo=2'] + # config.vm.synced_folder '..', '/vagrant' #, type: 'nfs', mount_options: ['actimeo=2'] + # config.vm.synced_folder '../../exercises', '/vagrant/exercises' #, type: 'nfs', mount_options: ['actimeo=2'] + # config.vm.synced_folder '../../config', '/vagrant/config' #, type: 'nfs', mount_options: ['actimeo=2'] config.vm.define 'control' do |machine| machine.vm.hostname = 'control' @@ -28,14 +28,14 @@ Vagrant.configure('2') do |config| machine.vm.network 'forwarded_port', guest: port, host: port, host_ip: '127.0.0.1' end machine.vm.network 'forwarded_port', guest: 80, host: 1080, host_ip: '127.0.0.1' - # machine.vm.network "public_network", bridge: 'dummy0', auto_config: false - # machine.vm.network "public_network", dev: "br25", type: "bridge", auto_config: false - machine.vm.network "private_network", ip: "192.168.56.21", name: "vagrant0" - machine.vm.network "private_network", ip: "192.168.57.21", name: "vagrant1" - machine.vm.network "private_network", ip: "192.168.58.21", name: "vagrant2" + # machine.vm.network 'public_network', bridge: 'dummy0', auto_config: false + # machine.vm.network 'public_network', dev: 'br25', type: 'bridge', auto_config: false + machine.vm.network 'private_network', ip: '192.168.56.21', name: 'vagrant0' + machine.vm.network 'private_network', ip: '192.168.57.21', name: 'vagrant1' + machine.vm.network 'private_network', ip: '192.168.58.21', name: 'vagrant2' end - config.vm.provision 'shell', name: 'provision/base', path: 'provision/base.sh', privileged: true + config.vm.provision 'shell', name: 'provision/base', path: 'provision/base.sh', privileged: true config.vm.provision 'shell', name: 'provision/openstack', path: 'provision/openstack.sh', privileged: false - config.vm.provision 'shell', inline: 'echo "SUCCESS"' + config.vm.provision 'shell', inline: 'echo SUCCESS' end diff --git a/vm-1.devstack/alt/Vagrantfile b/vm-1.devstack/alt/Vagrantfile new file mode 100644 index 0000000..3006308 --- /dev/null +++ b/vm-1.devstack/alt/Vagrantfile @@ -0,0 +1,26 @@ +# vim: set ts=2 sw=2 et ft=ruby: +# frozen_string_literal: true + +Vagrant.configure('2') do |config| + config.vm.box = 'debian/bookworm64' + + config.vm.provider 'libvirt' do |domain| + domain.memory = 8_000 + domain.nested = true + # domain.cpus = 2 + end + + # config.vm.synced_folder '..', '/vagrant' #, type: 'nfs', mount_options: ['actimeo=2'] + # config.vm.synced_folder '../../exercises', '/vagrant/exercises' #, type: 'nfs', mount_options: ['actimeo=2'] + # config.vm.synced_folder '../../config', '/vagrant/config' #, type: 'nfs', mount_options: ['actimeo=2'] + + config.vm.define 'control' do |machine| + machine.vm.hostname = 'control' + + machine.vm.network 'public_network', ip: '192.168.253.253', dev: 'svc0' + end + + # config.vm.provision 'shell', name: 'provision/base', path: 'provision/base.sh', privileged: true + # config.vm.provision 'shell', name: 'provision/openstack', path: 'provision/openstack.sh', privileged: false + # config.vm.provision 'shell', inline: 'echo SUCCESS' +end diff --git a/vagrant--devstack/provision/base.sh b/vm-1.devstack/provision/base.sh similarity index 100% rename from vagrant--devstack/provision/base.sh rename to vm-1.devstack/provision/base.sh diff --git a/vagrant--devstack/provision/openstack.sh b/vm-1.devstack/provision/openstack.sh similarity index 93% rename from vagrant--devstack/provision/openstack.sh rename to vm-1.devstack/provision/openstack.sh index 321ef41..4539743 100755 --- a/vagrant--devstack/provision/openstack.sh +++ b/vm-1.devstack/provision/openstack.sh @@ -93,7 +93,8 @@ disable_service tempest enable_plugin mistral https://opendev.org/openstack/mistral ## Enable designate -enable_plugin designate https://opendev.org/openstack/designate +## (buggy according to https://bugs.launchpad.net/designate/+bug/2036402) +# enable_plugin designate https://opendev.org/openstack/designate MARK ##