Bump Fedora version, remove archived versions prior to 37

Update kuryr multinode setup example
Update example for wmaker
2026-02-02 06:05:47 +01:00 · 2023-12-05 11:54:05 +01:00 · 2023-07-23 12:58:12 +02:00 · 2023-07-23 12:54:09 +02:00 · 2023-07-23 12:39:18 +02:00 · 2023-07-23 11:53:59 +02:00
7 changed files with 57 additions and 53 deletions
--- a/README.rst
+++ b/README.rst
@@ -55,25 +55,25 @@ or simply link it somewhere in the path:
   $ chmod +x ~/bin/boxpy

 and now you can issue some command. For example, to spin up a VM with Ubuntu
-18.04 with one CPU, 1GB of memory and 6GB of disk:
+20.04 with one CPU, 1GB of memory and 6GB of disk:

 .. code:: shell-session

-   $ boxpy create --version 18.04 myvm
+   $ boxpy create --version 20.04 myvm

 note, that Ubuntu is default distribution you don't need to specify
 ``--distro`` nor ``--version`` it will pick up latest LTS version. Now, let's
-recreate it with 20.04:
+recreate it with 22.04:

 .. code:: shell-session

-   $ boxpy rebuild --version 20.04 myvm
+   $ boxpy rebuild --version 22.04 myvm

 or recreate it with Fedora and add additional CPU:

 .. code:: shell-session

-   $ boxpy rebuild --distro fedora --version 34 --cpu 2 myvm
+   $ boxpy rebuild --distro fedora --version 39 --cpu 2 myvm

 now, let's connect to the VM using either ssh command, which is printed out at
 as last ``boxpy`` output line, or simply by using ssh boxpy command:
--- a/box.py
+++ b/box.py
@@ -22,8 +22,7 @@ __version__ = "1.9.2"

 CACHE_DIR = os.environ.get('XDG_CACHE_HOME', os.path.expanduser('~/.cache'))
 CLOUD_IMAGE = "ci.iso"
-FEDORA_RELEASE_MAP = {'32': '1.6', '33': '1.2', '34': '1.2', '35': '1.2',
-                      '36': '1.5', '37': '1.7', '38': '1.6'}
+FEDORA_RELEASE_MAP = {'37': '1.7', '38': '1.6', '39': '1.5'}
 DEBIAN_CODENAME_MAP = {'12': 'bookworm', '11': 'bullseye', '10': 'buster'}
 TYPE_MAP = {'HardDisk': 'disk', 'DVD': 'dvd', 'Floppy': 'floppy'}
 DISTRO_MAP = {'ubuntu': 'Ubuntu', 'fedora': 'Fedora',
@@ -1204,7 +1203,7 @@ DISTROS = {'ubuntu': {'username': 'ubuntu',
                      'realname': 'fedora',
                      'img_class': Fedora,
                      'amd64': 'x86_64',
-                      'default_version': '38'},
+                      'default_version': '39'},
           'centos': {'username': 'centos',
                      'realname': 'centos',
                      'img_class': CentosStream,
--- a/examples/devstack-fedora36.yaml
+++ b/examples/devstack-fedora36.yaml
@@ -1,9 +1,7 @@
-# Note, that cloud init will fail, due to old cloudinit package, which module
-# cc_keys_to_console doesn't recognize skipping option. Just ignore this error.
 package_update: true
 packages:
  - bash-completion
-  - ctags-etags
+  - ctags
  - git
  - git-review
  - htop
@@ -25,13 +23,13 @@ write_files:
      disable_service n-vnc
      disable_service dstat
 runcmd:
-  - [su, -, fedora, -c, "git clone https://opendev.org/openstack/devstack ~/devstack"]
-  - [su, -, fedora, -c, "cp /tmp/local.conf /home/fedora/devstack/"]
-  - [su, -, fedora, -c, "echo 'export HOST_IP=10.0.2.15' >> .bashrc"]
+  - su - fedora -c "git clone https://opendev.org/openstack/devstack ~/devstack"
+  - su - fedora -c "cp /tmp/local.conf /home/fedora/devstack/"
+  - su - fedora -c "echo 'export HOST_IP=10.0.2.15' >> .bashrc"
 boxpy_data:
  key: vm
  cpus: 2
  memory: 4GB
  disk_size: 10GB
  distro: fedora
-  version: 34
+  version: 36
--- a/examples/devstack-ubuntu-22.04.yaml
+++ b/examples/devstack-ubuntu-22.04.yaml
@@ -7,7 +7,7 @@ packages:
  - ipython3
  - jq
  - mc
-  - python-apsw
+  - python3-apsw
  - python3-flake8
  - python3-jedi
  - python3-pip
@@ -26,17 +26,15 @@ write_files:
      RABBIT_PASSWORD=$$ADMIN_PASSWORD
      SERVICE_PASSWORD=$$ADMIN_PASSWORD
 runcmd:
-  - [apt, purge, '-y', python3-pyasn1-modules]
-  - [apt, purge, '-y', python3-simplejson]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
-  - [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
-  - [su, -, ubuntu, -c, "echo 'export HOST_IP=10.0.2.15' >> .bashrc"]
+  - apt purge -y python3-pyasn1-modules
+  - apt purge -y python3-simplejson
+  - su - ubuntu -c "git clone https://opendev.org/openstack/devstack ~/devstack"
+  - su - ubuntu -c "cp /tmp/local.conf /home/ubuntu/devstack/"
+  - su - ubuntu -c "echo 'export HOST_IP=10.0.2.15' >> .bashrc"
 boxpy_data:
  key: vm
  cpus: 2
  memory: 6GB
  disk_size: 10GB
  distro: ubuntu
-  version: 20.04
+  version: 22.04
--- a/examples/kuryr_multinode_master.yaml
+++ b/examples/kuryr_multinode_master.yaml
@@ -7,7 +7,7 @@ packages:
  - ipython3
  - jq
  - mc
-  - python-apsw
+  - python3-apsw
  - python3-flake8
  - python3-jedi
  - python3-pip
@@ -122,6 +122,7 @@ write_files:

      # Vars
      ADMIN_PASSWORD="secretadmin"
+      CONTAINER_ENGINE="crio"
      DATABASE_PASSWORD="secretdatabase"
      ETCD_USE_RAMDISK="True"

@@ -131,9 +132,10 @@ write_files:
      KURYR_K8S_MULTI_WORKER_TESTS="True"
      KURYR_K8S_OCTAVIA_MEMBER_MODE="L2"
      KURYR_LB_ALGORITHM="SOURCE_IP_PORT"
-      KURYR_NEUTRON_DEFAULT_ROUTER="router1"
+      KURYR_NEUTRON_DEFAULT_ROUTER="kuryr-router"
      KURYR_SG_DRIVER="policy"
      KURYR_SUBNET_DRIVER="namespace"
+      KURYR_SUPPORT_POD_SECURITY="True"

      LOGFILE="/opt/stack/logs/devstacklog.txt"
      LOG_COLOR="False"
@@ -142,10 +144,11 @@ write_files:
      OCTAVIA_AMP_IMAGE_NAME="test-only-amphora-x64-haproxy-ubuntu-bionic"
      OCTAVIA_AMP_IMAGE_SIZE="3"

-      OVN_BRANCH="v20.06.2"
+      OVN_BRANCH="v21.06.0"
      OVN_BUILD_FROM_SOURCE="True"
      OVN_DBS_LOG_LEVEL="dbg"
      OVN_L3_CREATE_PUBLIC_NETWORK="True"
+      OVS_BRANCH="a4b04276ab5934d087669ff2d191a23931335c87"

      VAR_RUN_PATH="/usr/local/var/run"

@@ -167,23 +170,25 @@ write_files:
      enable_plugin octavia-tempest-plugin https://opendev.org/openstack/octavia-tempest-plugin
      enable_plugin ovn-octavia-provider https://opendev.org/openstack/ovn-octavia-provider

-      [[post-config|$OCTAVIA_CONF]]
+      [[post-config|$$OCTAVIA_CONF]]
      [api_settings]
      enabled_provider_drivers = amphora:'Octavia Amphora driver',ovn:'Octavia OVN driver'
 runcmd:
-  - [apt, purge, '-y', python3-pyasn1-modules]
-  - [apt, purge, '-y', python3-simplejson]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
-  - [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.10' >> .bashrc"]
-  - [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
-  - [systemctl, restart, systemd-networkd]
+  - systemctl stop systemd-resolved.service
+  - systemctl disable systemd-resolved.service
+  - echo "nameserver 1.1.1.1" > /etc/resolv.conf
+  - apt purge -y snapd
+  - apt purge -y python3-pyasn1-modules
+  - apt purge -y python3-simplejson
+  - su - ubuntu -c "git clone https://opendev.org/openstack/devstack"
+  - su - ubuntu -c "cp /tmp/local.conf /home/ubuntu/devstack/"
+  - su - ubuntu -c "echo 'export HOST_IP=192.168.10.10' >> .bashrc"
+  - systemctl restart systemd-networkd
 boxpy_data:
  key: vm
  cpus: 4
  memory: 16GB
  disk_size: 50GB
+  version: 20.04
  advanced:
    nic2: intnet
-  version: 20.04
--- a/examples/kuryr_multinode_worker.yaml
+++ b/examples/kuryr_multinode_worker.yaml
@@ -7,7 +7,7 @@ packages:
  - ipython3
  - jq
  - mc
-  - python-apsw
+  - python3-apsw
  - python3-flake8
  - python3-jedi
  - python3-pip
@@ -79,6 +79,7 @@ write_files:

      # Vars
      ADMIN_PASSWORD="secretadmin"
+      CONTAINER_ENGINE="crio"
      DATABASE_HOST="192.168.10.10"
      DATABASE_PASSWORD="secretdatabase"
      ENABLE_CHASSIS_AS_GW="False"
@@ -89,7 +90,7 @@ write_files:
      KURYR_EP_DRIVER_OCTAVIA_PROVIDER="ovn"
      KURYR_K8S_OCTAVIA_MEMBER_MODE="L2"
      KURYR_LB_ALGORITHM="SOURCE_IP_PORT"
-      KURYR_NEUTRON_DEFAULT_ROUTER="router1"
+      KURYR_NEUTRON_DEFAULT_ROUTER="kuryr-router"
      VAR_RUN_PATH="/usr/local/var/run"

      KURYR_ENABLED_HANDLERS="vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer"
@@ -97,10 +98,11 @@ write_files:
      KURYR_SUBNET_DRIVER="namespace"


-      OVN_BRANCH="v20.06.2"
+      OVN_BRANCH="v21.06.0"
      OVN_BUILD_FROM_SOURCE="True"
      OVN_DBS_LOG_LEVEL="dbg"
      OVN_L3_CREATE_PUBLIC_NETWORK="True"
+      OVS_BRANCH="a4b04276ab5934d087669ff2d191a23931335c87"


      LIBVIRT_TYPE="qemu"
@@ -120,19 +122,21 @@ write_files:
      enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container
      enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr
 runcmd:
-  - [apt, purge, '-y', python3-pyasn1-modules]
-  - [apt, purge, '-y', python3-simplejson]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
-  - [su, -, ubuntu, -c, "echo 'export HOST_IP=192.168.10.11' >> .bashrc"]
-  - [su, -, ubuntu, -c, "cp /tmp/local.conf /home/ubuntu/devstack/"]
-  - [systemctl, restart, systemd-networkd]
+  - systemctl stop systemd-resolved.service
+  - systemctl disable systemd-resolved.service
+  - echo "nameserver 1.1.1.1" > /etc/resolv.conf
+  - apt purge -y snapd
+  - apt purge -y python3-pyasn1-modules
+  - apt purge -y python3-simplejson
+  - su - ubuntu -c "git clone https://opendev.org/openstack/devstack"
+  - su - ubuntu -c "cp /tmp/local.conf /home/ubuntu/devstack/"
+  - su - ubuntu -c "echo 'export HOST_IP=192.168.10.11' >> .bashrc"
+  - systemctl restart systemd-networkd
 boxpy_data:
  key: vm
  cpus: 4
  memory: 16GB
  disk_size: 50GB
+  version: 20.04
  advanced:
    nic2: intnet
-  version: 20.04
--- a/examples/wmaker.yaml
+++ b/examples/wmaker.yaml
@@ -29,10 +29,10 @@ packages:
  - vim-nox
  - xinit
 runcmd:
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/wmaker -b experimental"]
-  - [su, -, ubuntu, -c, "git clone https://github.com/gryf/vmstrap"]
-  - [su, -, ubuntu, -c, "vmstrap/bootstrap.sh -c"]
-  - [rm, -fr, /home/ubuntu/vmstrap]
+  - su - ubuntu -c "git clone https://github.com/gryf/wmaker -b experimental"
+  - su - ubuntu -c "git clone https://github.com/gryf/vmstrap"
+  - su - ubuntu -c "vmstrap/bootstrap.sh -c"
+  - rm -fr /home/ubuntu/vmstrap
 boxpy_data:
  key: vm
  cpus: 4
Author	SHA1	Message	Date
gryf	71bf5b6d99	Bump Fedora version, remove archived versions prior to 37	2023-12-05 11:54:05 +01:00
gryf	e73d5ce458	Update kuryr multinode setup example	2023-07-23 12:58:12 +02:00
gryf	d623114f69	Update example for wmaker	2023-07-23 12:54:09 +02:00
gryf	51f642bea0	Updated ubuntu devstack example	2023-07-23 12:39:18 +02:00
gryf	12df0e97df	Updated fedora devstack example	2023-07-23 11:53:59 +02:00