diff --git a/os_builders/CHANGELOG b/os_builders/CHANGELOG index a20d3a4c..291b791f 100644 --- a/os_builders/CHANGELOG +++ b/os_builders/CHANGELOG @@ -11,8 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added new builders for Rocky 8 and 9 AQ images. [#148](https://github.com/stfc/cloud-image-builders/pull/148) ### Changed: +- Updated Ansible version for building. [#144](https://github.com/stfc/cloud-image-builders/pull/144) +- Created separate requirements file for RL8 image builds. [#153](https://github.com/stfc/cloud-image-builders/pull/153) ### Fixed: +- Ubuntu 22 stuck at reboot when building image. [#153](https://github.com/stfc/cloud-image-builders/pull/153) ## [0.1.0] diff --git a/os_builders/README.md b/os_builders/README.md index 3fa3597c..966f31ca 100644 --- a/os_builders/README.md +++ b/os_builders/README.md @@ -37,6 +37,7 @@ The pipeline consists of the following steps: cd cloud-image-builders/os_builders pip install -r requirements.txt + # If you are building the RL8 image use requirements-rl8.txt ansible-playbook prep_builder.yml ``` diff --git a/os_builders/requirements-rl8.txt b/os_builders/requirements-rl8.txt new file mode 100644 index 00000000..c24b67a2 --- /dev/null +++ b/os_builders/requirements-rl8.txt @@ -0,0 +1,4 @@ +ansible==9.13.0 +ansible-core==2.16.16 +# The most compatible OpenStack CLI version with OpenStack Yoga +python-openstackclient==5.8.0 diff --git a/os_builders/roles/tidy_image/tasks/reboot.yml b/os_builders/roles/tidy_image/tasks/reboot.yml index d2c274c6..4901349e 100644 --- a/os_builders/roles/tidy_image/tasks/reboot.yml +++ b/os_builders/roles/tidy_image/tasks/reboot.yml @@ -1,8 +1,6 @@ - name: Reboot machine ansible.builtin.reboot: - reboot_command: "shutdown -r" - post_reboot_delay: 30 - connect_timeout: 3600 + pre_reboot_delay: 4 become: true \ No newline at end of file