From b00b4db3e28ef124654270a8085fe9d846385f0b Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 11 Sep 2023 17:22:39 +0100 Subject: [PATCH] Allow deployment on debian bookworm hosts Change-Id: I1a2d8e6ecbc12168971b3983308ffaf537b87d19 --- playbooks/openstack-hosts-setup.yml | 1 + scripts/bootstrap-ansible.sh | 2 +- tests/roles/bootstrap-host/tasks/check-requirements.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index e1bdc90fcb..3649bb338f 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -54,6 +54,7 @@ assert: that: - (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or + (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bookworm') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'jammy') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9') msg: > diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index ef11ed0664..b662bc8e97 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -104,7 +104,7 @@ case ${DISTRO_ID} in ubuntu|debian) apt-get update DEBIAN_FRONTEND=noninteractive apt-get -y install \ - git-core curl gcc netcat \ + git-core curl gcc \ libssl-dev libffi-dev \ libsystemd-dev pkg-config \ wget diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml index 1123c08591..740c815428 100644 --- a/tests/roles/bootstrap-host/tasks/check-requirements.yml +++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml @@ -17,6 +17,7 @@ assert: that: (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bullseye') or + (ansible_facts['distribution'] == 'Debian' and ansible_facts['distribution_release'] == 'bookworm') or (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_release'] == 'jammy') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '8') or (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] == '9')