Merge "Deprecate ironic-inspector support"

This commit is contained in:
Zuul 2024-02-20 19:53:25 +00:00 committed by Gerrit Code Review
commit 7a6af41a26
9 changed files with 20 additions and 19 deletions

View File

@ -17,8 +17,9 @@ ironic-inspector_
Inspector is an auxiliary service that provides `in-band inspection`_. Inspector is an auxiliary service that provides `in-band inspection`_.
Its `introspection API`_ is served on TCP port 5050. Its `introspection API`_ is served on TCP port 5050.
Inspector can be disabled by setting ``enable_inspector=false``. In this Inspector is deprecated and can be enabled by setting
case, Ironic's `native in-band inspection`_ will be used. ``enable_inspector=true``. Otherwise, Ironic's `native in-band inspection`_
is used.
mariadb_ mariadb_
MariaDB is used as a database to persistently store information. MariaDB is used as a database to persistently store information.

View File

@ -23,4 +23,4 @@
ENABLE_TLS: "{{ enable_tls | default(false) | bool | lower }}" ENABLE_TLS: "{{ enable_tls | default(false) | bool | lower }}"
ENABLE_PROMETHEUS_EXPORTER: "{{ enable_prometheus_exporter | default(false) | bool | lower }}" ENABLE_PROMETHEUS_EXPORTER: "{{ enable_prometheus_exporter | default(false) | bool | lower }}"
USE_VMEDIA: "{{ use_vmedia | default(false) | bool | lower }}" USE_VMEDIA: "{{ use_vmedia | default(false) | bool | lower }}"
USE_INSPECTOR: "{{ use_inspector | default(true) | bool | lower }}" USE_INSPECTOR: "{{ use_inspector | default(false) | bool | lower }}"

View File

@ -231,7 +231,7 @@ inventory_dns: False
# dnsmasq_ntp_servers: # dnsmasq_ntp_servers:
# Settings to enable the use of inspector # Settings to enable the use of inspector
enable_inspector: true enable_inspector: false
inspector_debug: true inspector_debug: true
inspector_manage_firewall: false inspector_manage_firewall: false

View File

@ -5,7 +5,7 @@ ans_network_interface: "{{ network_interface | replace('-', '_') }}"
internal_ip: "{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}" internal_ip: "{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}"
enable_tls: false enable_tls: false
enable_inspector: true enable_inspector: false
skip_start: False skip_start: False
skip_validation: "{{ skip_start }}" skip_validation: "{{ skip_start }}"

View File

@ -53,7 +53,7 @@ ironicinspectorclient_source_install: false
sushy_source_install: false sushy_source_install: false
staging_drivers_source_install: true staging_drivers_source_install: true
prometheus_exporter_source_install: true prometheus_exporter_source_install: true
enable_inspector: true enable_inspector: false
enable_keystone: false enable_keystone: false
enable_prometheus_exporter: false enable_prometheus_exporter: false
staging_drivers_include: false staging_drivers_include: false

View File

@ -1,7 +1,7 @@
--- ---
features: features:
- | - |
When ``enable_inspector`` is set to ``false`` (the default is ``true``), When ``enable_inspector`` is set to ``false`` (the default),
the new built-in inspection implementation is now configured. Note that the new built-in inspection implementation is now configured. Note that
* The new implementation has not at the moment of writing achieved a * The new implementation has not at the moment of writing achieved a
@ -15,4 +15,6 @@ features:
upgrade: upgrade:
- | - |
If ironic-inspector support is disabled via ``enable_inspector`` set to If ironic-inspector support is disabled via ``enable_inspector`` set to
``false``, the service will be stopped and removed on upgrade. ``false``, the service will be stopped and removed on upgrade. Nodes that
use the ``inspector`` inspect interface will be changed to ``agent`` when
running online data migrations.

View File

@ -35,7 +35,7 @@ TEST_VM_NUM_NODES=1
DOWNLOAD_CUSTOM_DEPLOY_IMAGE=true DOWNLOAD_CUSTOM_DEPLOY_IMAGE=true
TESTING_USER=cirros TESTING_USER=cirros
TEST_PLAYBOOK="test-bifrost.yaml" TEST_PLAYBOOK="test-bifrost.yaml"
USE_INSPECTOR=${USE_INSPECTOR:-true} USE_INSPECTOR=${USE_INSPECTOR:-false}
INSPECT_NODES=true INSPECT_NODES=true
INVENTORY_DHCP=false INVENTORY_DHCP=false
INVENTORY_DHCP_STATIC_IP=false INVENTORY_DHCP_STATIC_IP=false
@ -97,7 +97,6 @@ ANSIBLE_PYTHON_INTERP=${VENV}/bin/python3
# Adjust options for DHCP, VM, or Keystone tests # Adjust options for DHCP, VM, or Keystone tests
if [ ${USE_DHCP} = "true" ]; then if [ ${USE_DHCP} = "true" ]; then
ENABLE_INSPECTOR=false
INSPECT_NODES=false INSPECT_NODES=false
TEST_VM_NUM_NODES=3 TEST_VM_NUM_NODES=3
VM_DISK=4 VM_DISK=4
@ -109,7 +108,6 @@ elif [ ${BUILD_IMAGE} = "true" ]; then
DOWNLOAD_CUSTOM_DEPLOY_IMAGE=false DOWNLOAD_CUSTOM_DEPLOY_IMAGE=false
TESTING_USER=root TESTING_USER=root
VM_MEMORY_SIZE="4096" VM_MEMORY_SIZE="4096"
ENABLE_INSPECTOR=false
INSPECT_NODES=false INSPECT_NODES=false
DOWNLOAD_IPA=false DOWNLOAD_IPA=false
CREATE_IPA_IMAGE=true CREATE_IPA_IMAGE=true

View File

@ -123,10 +123,10 @@
enable_prometheus_exporter: true enable_prometheus_exporter: true
- job: - job:
name: bifrost-integration-noinspector-ubuntu-jammy name: bifrost-integration-inspector-ubuntu-jammy
parent: bifrost-integration-tinyipa-ubuntu-jammy parent: bifrost-integration-tinyipa-ubuntu-jammy
vars: vars:
use_inspector: false use_inspector: true
- job: - job:
name: bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy name: bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
@ -174,10 +174,10 @@
enable_prometheus_exporter: true enable_prometheus_exporter: true
- job: - job:
name: bifrost-integration-noinspector-centos-9 name: bifrost-integration-inspector-centos-9
parent: bifrost-integration-tinyipa-centos-9 parent: bifrost-integration-tinyipa-centos-9
vars: vars:
use_inspector: false use_inspector: true
- job: - job:
name: bifrost-integration-tinyipa-debian-bullseye name: bifrost-integration-tinyipa-debian-bullseye

View File

@ -16,8 +16,8 @@
- bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
- bifrost-integration-redfish-vmedia-uefi-centos-9 - bifrost-integration-redfish-vmedia-uefi-centos-9
- bifrost-integration-redfish-vmedia-uefi-debian-bookworm - bifrost-integration-redfish-vmedia-uefi-debian-bookworm
- bifrost-integration-noinspector-centos-9 - bifrost-integration-inspector-centos-9
- bifrost-integration-noinspector-ubuntu-jammy - bifrost-integration-inspector-ubuntu-jammy
- bifrost-upgrade-ubuntu-jammy - bifrost-upgrade-ubuntu-jammy
- bifrost-upgrade-keystone-centos9 - bifrost-upgrade-keystone-centos9
# Non-voting jobs # Non-voting jobs
@ -69,8 +69,8 @@
- bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy - bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
- bifrost-integration-redfish-vmedia-uefi-centos-9 - bifrost-integration-redfish-vmedia-uefi-centos-9
- bifrost-integration-redfish-vmedia-uefi-debian-bookworm - bifrost-integration-redfish-vmedia-uefi-debian-bookworm
- bifrost-integration-noinspector-centos-9 - bifrost-integration-inspector-centos-9
- bifrost-integration-noinspector-ubuntu-jammy - bifrost-integration-inspector-ubuntu-jammy
- bifrost-upgrade-ubuntu-jammy - bifrost-upgrade-ubuntu-jammy
- bifrost-upgrade-keystone-centos9 - bifrost-upgrade-keystone-centos9
experimental: experimental: