Merge "Add os_release variable, build CentOS stream images"

ansible/group_vars/all/bifrost

@@ -21,9 +21,8 @@ kolla_bifrost_firewalld_internal_zone: trusted
 # DIB base OS element. Default is {{ os_distribution }}.
 kolla_bifrost_dib_os_element: "{{ os_distribution }}"
 
-# DIB image OS release. Default is "focal" when os_distribution is "ubuntu", or
-# "8" otherwise.
-kolla_bifrost_dib_os_release: "{{ 'focal' if os_distribution == 'ubuntu' else '8' }}"
+# DIB image OS release. Default is {{ os_release }}.
+kolla_bifrost_dib_os_release: "{{ os_release }}"
 
 # List of default DIB elements. Default is ["disable-selinux",
 # "enable-serial-console", "vm"] when os_distribution is "centos", or

ansible/group_vars/all/globals

@@ -47,3 +47,7 @@ kayobe_ansible_user: "stack"
 # OS distribution name. Valid options are "centos", "ubuntu". Default is
 # "centos".
 os_distribution: "centos"
+
+# OS release. Valid options are "8-stream" when os_distribution is "centos", or
+# "focal" when os_distribution is "ubuntu".
+os_release: "{{ '8-stream' if os_distribution == 'centos' else 'focal' }}"

ansible/group_vars/all/ipa

@@ -23,6 +23,7 @@ ipa_builder_source_version: master
 # images. Default is ["centos", "enable-serial-console",
 # "ironic-python-agent-ramdisk"].
 ipa_build_dib_elements_default:
+  # TODO(mgoddard): Use {{ os_distribution }} here when Ubuntu IPA builds work.
   - centos
   - enable-serial-console
   - ironic-python-agent-ramdisk
@@ -41,6 +42,9 @@ ipa_build_dib_elements: >
 # Dictionary of default environment variables to provide to Diskimage Builder
 # (DIB) during IPA image build.
 ipa_build_dib_env_default:
+  # TODO(mgoddard): Use {{ os_release }} here when we use os_distribution
+  # above.
+  DIB_RELEASE: "8-stream"
   DIB_REPOLOCATION_ironic_agent: "{{ ipa_build_source_url }}"
   DIB_REPOREF_ironic_agent: "{{ ipa_build_source_version }}"
 

etc/kayobe/bifrost.yml

@@ -21,8 +21,7 @@
 # DIB base OS element. Default is {{ os_distribution }}.
 #kolla_bifrost_dib_os_element:
 
-# DIB image OS release. Default is "focal" when os_distribution is "ubuntu", or
-# "8" otherwise.
+# DIB image OS release. Default is {{ os_release }}.
 #kolla_bifrost_dib_os_release:
 
 # List of default DIB elements. Default is ["disable-selinux",

etc/kayobe/globals.yml

@@ -49,6 +49,10 @@
 # "centos".
 #os_distribution:
 
+# OS release. Valid options are "8-stream" when os_distribution is "centos", or
+# "focal" when os_distribution is "ubuntu".
+#os_release:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

releasenotes/notes/os-distribution-69445eb19a611d43.yaml

@@ -3,7 +3,10 @@ features:
   - |
     Adds an ``os_distribution`` variable in ``etc/kayobe/globals.yml``, with a
     default value of ``centos``. The variable can also be set to ``ubuntu``,
-    and sets sensible default values for other variables.
+    and sets sensible default values for other variables. Also adds an
+    ``os_release`` variable in the same file, with a default value of
+    ``8-stream`` when ``os_distribution`` is ``centos`` or ``focal`` when
+    ``os_distribution`` is ``ubuntu``.
 upgrade:
   - |
     Modifies the default value of ``controller_bootstrap_user``,