Switch to CentOS Stream distro

electrocucaracha · Mar 1, 2022 · 8138f51 · 8138f51
1 parent f372654
commit 8138f51
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/ci/update_distros.sh b/ci/update_distros.sh
@@ -46,6 +46,7 @@ function _get_box_current_version {
 function _vagrant_pull {
     local alias="$1"
     local name="$2"
+    local vb_controller="${3:-IDE Controller}"
 
     version=$(_get_box_current_version "$name")
 
@@ -61,7 +62,7 @@ function _vagrant_pull {
     cat << EOT >> .distros_supported.yml
   $alias:
     name: $name
-    vb_controller: IDE Controller
+    vb_controller: $vb_controller
     version: "$version"
 EOT
 }
@@ -85,7 +86,7 @@ cat << EOT > .distros_supported.yml
 EOT
 
 echo "centos:" >> .distros_supported.yml
-_vagrant_pull "8" "generic/centos8"
+_vagrant_pull "8" "centos/stream8" "IDE"
 echo "ubuntu:" >> .distros_supported.yml
 _vagrant_pull "focal" "generic/ubuntu2004"
 echo "debian:" >> .distros_supported.yml

diff --git a/distros_supported.yml b/distros_supported.yml
@@ -10,9 +10,9 @@
 
 centos:
   8:
-    name: generic/centos8
-    vb_controller: IDE Controller
-    version: "3.6.4"
+    name: centos/stream8
+    vb_controller: IDE
+    version: "20210210.0"
 ubuntu:
   focal:
     name: generic/ubuntu2004

diff --git a/registry.sh b/registry.sh
@@ -44,7 +44,7 @@ for kv in "tag=${OPENSTACK_TAG:-xena}" \
     "base=${OS_KOLLA_BASE:-${ID,,}}" \
     "threads=$(( num_cpus * 2 ))" \
     "push_threads=$(( num_cpus * 4 ))"; do
-    sudo crudini --set /etc/kolla/kolla-build.ini DEFAULT "${kv%=*}" "${kv#*=}"
+    sudo -E "$(command -v crudini)" --set /etc/kolla/kolla-build.ini DEFAULT "${kv%=*}" "${kv#*=}"
 done
 
 bifrost_header=""

diff --git a/samples/distributed/Vagrantfile b/samples/distributed/Vagrantfile
@@ -110,7 +110,7 @@ Vagrant.configure("2") do |config|
           node["volumes"].each do |volume|
             volume_file = "#{node['name']}-#{volume['name']}.vdi"
             v.customize ["createmedium", "disk", "--filename", volume_file, "--size", (volume["size"] * 1024)] unless File.exist?(volume_file)
-            v.customize ["storageattach", :id, "--storagectl", "IDE Controller", "--port", 1, "--device", 0, "--type", "hdd", "--medium", volume_file]
+            v.customize ["storageattach", :id, "--storagectl", box["vb_controller"], "--port", 1, "--device", 0, "--type", "hdd", "--medium", volume_file]
           end
         end
       end