Merge pull request #25 from stackhpc/xena-rocky-dib

Xena rocky dib

Author: priteau

ansible/group_vars/all/infra-vms

@@ -46,15 +46,15 @@ infra_vm_root_format: qcow2
 # http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 infra_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
   {%- elif os_distribution == 'rocky' %}
   http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
   {%- else -%}
-  https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2
+  https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the infra VM data volume.

ansible/group_vars/all/overcloud-dib

@@ -7,8 +7,8 @@
 # Whether to build host disk images with DIB directly instead of through
 # Bifrost. Setting it to true disables Bifrost image build and allows images to
 # be built with the `kayobe overcloud host image build` command. Default value
-# is False. This will change in a future release.
-overcloud_dib_build_host_images: False
+# is {{ os_distribution == 'rocky' }}. This will change in a future release.
+overcloud_dib_build_host_images: "{{ os_distribution == 'rocky' }}"
 
 # List of overcloud host disk images to build. Each element is a dict defining
 # an image in a format accepted by the stackhpc.os-images role. Default is to
@@ -22,20 +22,24 @@ overcloud_dib_host_images:
     env: "{{ overcloud_dib_env_vars }}"
     packages: "{{ overcloud_dib_packages }}"
 
-# DIB base OS element. Default is {{ os_distribution }}.
-overcloud_dib_os_element: "{{ os_distribution }}"
+# DIB base OS element. Default is {{ 'rocky-container' if os_distribution ==
+# 'rocky' else os_distribution }}.
+overcloud_dib_os_element: "{{ 'rocky-container' if os_distribution == 'rocky' else os_distribution }}"
 
 # DIB image OS release. Default is {{ os_release }}.
 overcloud_dib_os_release: "{{ os_release }}"
 
 # List of default DIB elements. Default is ["centos", "cloud-init-datasources",
 # "disable-selinux", "enable-serial-console", "vm"] when
-# overcloud_dib_os_element is "centos", or ["ubuntu", "cloud-init-datasources",
-# "enable-serial-console", "vm"] when overcloud_dib_os_element is "ubuntu".
+# overcloud_dib_os_element is "centos", or ["rocky-container",
+# "cloud-init-datasources", "disable-selinux", "enable-serial-console", "vm"]
+# when overcloud_dib_os_element is "rocky" or
+# ["ubuntu", "cloud-init-datasources", "enable-serial-console", "vm"]
+# when overcloud_dib_os_element is "ubuntu".
 overcloud_dib_elements_default:
   - "{{ overcloud_dib_os_element }}"
   - "cloud-init-datasources"
-  - "{% if overcloud_dib_os_element == 'centos' %}disable-selinux{% endif %}"
+  - "{% if overcloud_dib_os_element in ['centos', 'rocky'] %}disable-selinux{% endif %}"
   - "enable-serial-console"
   - "vm"
 
@@ -48,11 +52,14 @@ overcloud_dib_elements: "{{ overcloud_dib_elements_default | select | list + ove
 
 # DIB default environment variables. Default is
 # {"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text
-# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive", "DIB_RELEASE":
-# "{{ overcloud_dib_os_release }}"}.
+# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive",
+# "DIB_CONTAINERFILE_RUNTIME": "docker", "DIB_CONTAINERFILE_NETWORK_DRIVER":
+# "host", "DIB_RELEASE": "{{ overcloud_dib_os_release }}"}.
 overcloud_dib_env_vars_default:
   DIB_BOOTLOADER_DEFAULT_CMDLINE: "nofb nomodeset gfxpayload=text net.ifnames=1"
   DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive"
+  DIB_CONTAINERFILE_RUNTIME: "docker"
+  DIB_CONTAINERFILE_NETWORK_DRIVER: "host"
   DIB_RELEASE: "{{ overcloud_dib_os_release }}"
 
 # DIB additional environment variables. Default is none.

ansible/group_vars/all/seed-vm

@@ -46,15 +46,15 @@ seed_vm_root_format: qcow2
 # http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 seed_vm_root_image: >-
   {%- if os_distribution == 'ubuntu' %}
   https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img
   {%- elif os_distribution == 'rocky' %}
   http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
   {%- else -%}
-  https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2
+  https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2
   {%- endif %}
 
 # Capacity of the seed VM data volume.

doc/source/configuration/reference/overcloud-dib.rst

@@ -19,7 +19,8 @@ following option:
     Whether to build host disk images with DIB directly instead of through
     Bifrost. Setting it to true disables Bifrost image build and allows images
     to be built with the ``kayobe overcloud host image build`` command. Default
-    value is false. This will change in a future release.
+    value is false, except on Rocky where it is true. This will change in a
+    future release.
 
 With this option enabled, Bifrost will be configured to stop building a root
 disk image. This will become the default behaviour in a future release.
@@ -35,7 +36,8 @@ information on building disk images.
 
 The default configuration builds a whole disk (partitioned) image using the
 selected :ref:`OS distribution <os-distribution>` (CentOS Stream 8 by default)
-with serial console enabled, and SELinux disabled if CentOS Stream is used.
+with serial console enabled, and SELinux disabled if CentOS Stream or Rocky
+Linux is used.
 `Cloud-init <https://cloudinit.readthedocs.io/en/latest/>`__ is used to process
 the configuration drive built by Bifrost during provisioning.
 
@@ -48,17 +50,19 @@ the configuration drive built by Bifrost during provisioning.
     "elements": "{{ overcloud_dib_elements }}", "env": "{{
     overcloud_dib_env_vars }}", "packages": "{{ overcloud_dib_packages }}"}``.
 ``overcloud_dib_os_element``
-    DIB base OS element. Default is ``{{ os_distribution }}``.
+    DIB base OS element. Default is ``{{ 'rocky-container' if os_distribution == 'rocky' else os_distribution }}``.
 ``overcloud_dib_os_release``
     DIB image OS release. Default is ``{{ os_release }}``.
 ``overcloud_dib_elements_default``
     List of default DIB elements. Default is ``["centos",
     "cloud-init-datasources", "disable-selinux", "enable-serial-console",
-    "vm"]`` when ``overcloud_dib_os_element`` is ``centos``, or ``["ubuntu",
-    "cloud-init-datasources", "enable-serial-console", "vm"]`` when
-    ``overcloud_dib_os_element`` is ``ubuntu``. The ``vm`` element is poorly
-    named, and causes DIB to build a whole disk image rather than a single
-    partition.
+    "vm"]`` when ``overcloud_dib_os_element`` is ``centos``, or
+    ``["rocky-container", "cloud-init-datasources", "disable-selinux",
+    "enable-serial-console", "vm"]`` when overcloud_dib_os_element is ``rocky``
+    or ``["ubuntu", "cloud-init-datasources", "enable-serial-console", "vm"]``
+    when ``overcloud_dib_os_element`` is ``ubuntu``. The ``vm`` element is
+    poorly named, and causes DIB to build a whole disk image rather than a
+    single partition.
 ``overcloud_dib_elements_extra``
     List of additional DIB elements. Default is none.
 ``overcloud_dib_elements``
@@ -67,8 +71,9 @@ the configuration drive built by Bifrost during provisioning.
 ``overcloud_dib_env_vars_default``
     DIB default environment variables. Default is
     ``{"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text
-    net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive", "DIB_RELEASE":
-    "{{ overcloud_dib_os_release }}"}``.
+    net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive",
+    "DIB_CONTAINERFILE_RUNTIME": "docker", "DIB_CONTAINERFILE_NETWORK_DRIVER":
+    "host", DIB_RELEASE": "{{ overcloud_dib_os_release }}"}``.
 ``overcloud_dib_env_vars_extra``
     DIB additional environment variables. Default is none.
 ``overcloud_dib_env_vars``

doc/source/deployment.rst

@@ -178,8 +178,7 @@ deploy the overcloud nodes using Disk Image Builder (DIB), unless
 .. note::
 
    If you are using Rocky Linux - building of the Operating System image
-   needs to be done outside of Kayobe (no support for diskimage-builder
-   containerfile element based builds in bifrost container).
+   needs to be done using ``kayobe overcloud host image build``.
 
 To deploy the seed services in containers::
 
@@ -230,7 +229,8 @@ Building Overcloud Host Disk Images
 .. note::
 
    This step is only relevant if ``overcloud_dib_build_host_images`` is set to
-   ``True``. By default, a host disk image is automatically built by Bifrost.
+   ``True``. By default, a host disk image is automatically built by Bifrost
+   unless you're running Rocky Linux - which requires this step.
 
 Host disk images are deployed on overcloud hosts during provisioning. To build
 host disk images::

etc/kayobe/infra-vms.yml

@@ -35,7 +35,7 @@
 # http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

etc/kayobe/overcloud-dib.yml

@@ -7,7 +7,7 @@
 # Whether to build host disk images with DIB directly instead of through
 # Bifrost. Setting it to true disables Bifrost image build and allows images to
 # be built with the `kayobe overcloud host image build` command. Default value
-# is False. This will change in a future release.
+# is {{ os_distribution == 'rocky' }}. This will change in a future release.
 #overcloud_dib_build_host_images:
 
 # List of overcloud host disk images to build. Each element is a dict defining
@@ -18,16 +18,20 @@
 # "packages": "{{ overcloud_dib_packages }}"}.
 #overcloud_dib_host_images:
 
-# DIB base OS element. Default is {{ os_distribution }}.
+# DIB base OS element. Default is {{ 'rocky-container' if os_distribution ==
+# 'rocky' else os_distribution }}.
 #overcloud_dib_os_element:
 
 # DIB image OS release. Default is {{ os_release }}.
 #overcloud_dib_os_release:
 
 # List of default DIB elements. Default is ["centos", "cloud-init-datasources",
 # "disable-selinux", "enable-serial-console", "vm"] when
-# overcloud_dib_os_element is "centos", or ["ubuntu", "cloud-init-datasources",
-# "enable-serial-console", "vm"] when overcloud_dib_os_element is "ubuntu".
+# overcloud_dib_os_element is "centos", or ["rocky-container",
+# "cloud-init-datasources", "disable-selinux", "enable-serial-console", "vm"]
+# when overcloud_dib_os_element is "rocky" or
+# ["ubuntu", "cloud-init-datasources", "enable-serial-console", "vm"]
+# when overcloud_dib_os_element is "ubuntu".
 #overcloud_dib_elements_default:
 
 # List of additional DIB elements. Default is none.
@@ -39,8 +43,9 @@
 
 # DIB default environment variables. Default is
 # {"DIB_BOOTLOADER_DEFAULT_CMDLINE": "nofb nomodeset gfxpayload=text
-# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive", "DIB_RELEASE":
-# "{{ overcloud_dib_os_release }}"}.
+# net.ifnames=1", "DIB_CLOUD_INIT_DATASOURCES": "ConfigDrive",
+# "DIB_CONTAINERFILE_RUNTIME": "docker", "DIB_CONTAINERFILE_NETWORK_DRIVER":
+# "host", "DIB_RELEASE": "{{ overcloud_dib_os_release }}"}.
 #overcloud_dib_env_vars_default:
 
 # DIB additional environment variables. Default is none.

etc/kayobe/seed-vm.yml

@@ -29,7 +29,7 @@
 # http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 #seed_vm_root_image:
 

playbooks/kayobe-seed-vm-base/overrides.yml.j2

@@ -53,3 +53,5 @@ configdrive_debian_network_interfaces_supports_glob: false
 # are using for SSH to be removed. Use a dummy interface.
 aio_bridge_ports:
   - dummy1
+
+overcloud_dib_build_host_images: False

releasenotes/notes/update-centos-cloud-image-db4f69b7e87f23ac.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Updates base CentOS Stream cloud image to CentOS-Stream-GenericCloud-8-20210603.0.x86_64.