From 0a5de94bf3b59e725355fee452fe81977f34cdee Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Thu, 16 Mar 2023 12:13:58 +0000 Subject: [PATCH] Add a no_driver ironic driver type Enabling this driver type ensures that the no-console, no-raid and no-inspect interfaces are enabled so that they can be later configured on a per-node basis if required. These interfaces are useful to have enabled at the same time as driver specific interfaces such as idrac or ilo in order so that managment of specific functions can be disabled if required. Change-Id: I2904ba005e3fa18faf8ccf04661e206501fa4aa3 --- defaults/main.yml | 1 + releasenotes/notes/no_driver-b289e1c4e2fafabe.yaml | 7 +++++++ vars/main.yml | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/no_driver-b289e1c4e2fafabe.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 4cf45491..c33a81d1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -328,6 +328,7 @@ ironic_conductor_init_config_overrides: {} # driver definitions ironic_drivers_enabled: + - no_driver - agent_ipmitool - pxe_ipmitool diff --git a/releasenotes/notes/no_driver-b289e1c4e2fafabe.yaml b/releasenotes/notes/no_driver-b289e1c4e2fafabe.yaml new file mode 100644 index 00000000..a0ef14db --- /dev/null +++ b/releasenotes/notes/no_driver-b289e1c4e2fafabe.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + A new driver type ``no_driver`` is defined in the os_ironic role which + enables the ``no-console``, ``no-raid`` and ``no-inspect`` interfaces + in the ironic configuration. This driver is added to the defaults set of + drivers configured by the ironic ansible role. diff --git a/vars/main.yml b/vars/main.yml index b6d5e8ae..208704cc 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -20,6 +20,10 @@ _ironic_inspector_is_first_play_host: "{{ (ironic_services['ironic-inspector'][' # task to save time. ironic_driver_types: + no_driver: + inspect: no-inspect + console: no-console + raid: no-raid agent_ilo: hardware_type: ilo boot: ilo-virtual-media @@ -140,7 +144,7 @@ ironic_packages_list: > {%- set package_list = package_list + ironic_inspector_http_distro_packages %} {%- endif %} {%- if 'ipmitool-socat' in (filtered_ironic_drivers | json_query('[*].console') | unique) %} - {% set package_list = package_list + ironic_ipmitool_socat_distro_packages %} + {%- set package_list = package_list + ironic_ipmitool_socat_distro_packages %} {%- endif %} {{- package_list -}}