Skip to content

Commit

Permalink
Deprecate ironic-inspector support
Browse files Browse the repository at this point in the history
Switches to the built-in inspection by default and deprecates support
for ironic-inspector. The actual removal should happen after we get
inspection rules in since it's the last feature that is relevant for
bifrost.

Depends-On: https://review.opendev.org/c/openstack/ironic/+/907398
Change-Id: Id157d5ada2ff3f87f3f4d161423b1f3989f73194
  • Loading branch information
dtantsur committed Feb 1, 2024
1 parent e8f365e commit dcbf1d9
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 19 deletions.
5 changes: 3 additions & 2 deletions doc/source/user/architecture.rst
Expand Up @@ -17,8 +17,9 @@ ironic-inspector_
Inspector is an auxiliary service that provides `in-band inspection`_.
Its `introspection API`_ is served on TCP port 5050.

Inspector can be disabled by setting ``enable_inspector=false``. In this
case, Ironic's `native in-band inspection`_ will be used.
Inspector is deprecated and can be enabled by setting
``enable_inspector=true``. Otherwise, Ironic's `native in-band inspection`_
is used.

mariadb_
MariaDB is used as a database to persistently store information.
Expand Down
2 changes: 1 addition & 1 deletion playbooks/ci/run.yaml
Expand Up @@ -23,4 +23,4 @@
ENABLE_TLS: "{{ enable_tls | default(false) | bool | lower }}"
ENABLE_PROMETHEUS_EXPORTER: "{{ enable_prometheus_exporter | 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 }}"
2 changes: 1 addition & 1 deletion playbooks/roles/bifrost-ironic-install/defaults/main.yml
Expand Up @@ -231,7 +231,7 @@ inventory_dns: False
# dnsmasq_ntp_servers:

# Settings to enable the use of inspector
enable_inspector: true
enable_inspector: false
inspector_debug: true
inspector_manage_firewall: false

Expand Down
Expand Up @@ -5,7 +5,7 @@ ans_network_interface: "{{ network_interface | replace('-', '_') }}"
internal_ip: "{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}"

enable_tls: false
enable_inspector: true
enable_inspector: false

skip_start: False
skip_validation: "{{ skip_start }}"
Expand Down
2 changes: 1 addition & 1 deletion playbooks/roles/bifrost-prep-for-install/defaults/main.yml
Expand Up @@ -53,7 +53,7 @@ ironicinspectorclient_source_install: false
sushy_source_install: false
staging_drivers_source_install: true
prometheus_exporter_source_install: true
enable_inspector: true
enable_inspector: false
enable_keystone: false
enable_prometheus_exporter: false
staging_drivers_include: false
Expand Down
6 changes: 4 additions & 2 deletions releasenotes/notes/new-inspection-441b578de2206415.yaml
@@ -1,7 +1,7 @@
---
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 implementation has not at the moment of writing achieved a
Expand All @@ -15,4 +15,6 @@ features:
upgrade:
- |
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.
4 changes: 1 addition & 3 deletions scripts/test-bifrost.sh
Expand Up @@ -35,7 +35,7 @@ TEST_VM_NUM_NODES=1
DOWNLOAD_CUSTOM_DEPLOY_IMAGE=true
TESTING_USER=cirros
TEST_PLAYBOOK="test-bifrost.yaml"
USE_INSPECTOR=${USE_INSPECTOR:-true}
USE_INSPECTOR=${USE_INSPECTOR:-false}
INSPECT_NODES=true
INVENTORY_DHCP=false
INVENTORY_DHCP_STATIC_IP=false
Expand Down Expand Up @@ -90,7 +90,6 @@ ANSIBLE_PYTHON_INTERP=${VENV}/bin/python3

# Adjust options for DHCP, VM, or Keystone tests
if [ ${USE_DHCP} = "true" ]; then
ENABLE_INSPECTOR=false
INSPECT_NODES=false
TEST_VM_NUM_NODES=3
VM_DISK=4
Expand All @@ -102,7 +101,6 @@ elif [ ${BUILD_IMAGE} = "true" ]; then
DOWNLOAD_CUSTOM_DEPLOY_IMAGE=false
TESTING_USER=root
VM_MEMORY_SIZE="4096"
ENABLE_INSPECTOR=false
INSPECT_NODES=false
DOWNLOAD_IPA=false
CREATE_IPA_IMAGE=true
Expand Down
8 changes: 4 additions & 4 deletions zuul.d/bifrost-jobs.yaml
Expand Up @@ -120,10 +120,10 @@
enable_prometheus_exporter: true

- job:
name: bifrost-integration-noinspector-ubuntu-jammy
name: bifrost-integration-inspector-ubuntu-jammy
parent: bifrost-integration-tinyipa-ubuntu-jammy
vars:
use_inspector: false
use_inspector: true

- job:
name: bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
Expand Down Expand Up @@ -171,10 +171,10 @@
enable_prometheus_exporter: true

- job:
name: bifrost-integration-noinspector-centos-9
name: bifrost-integration-inspector-centos-9
parent: bifrost-integration-tinyipa-centos-9
vars:
use_inspector: false
use_inspector: true

- job:
name: bifrost-integration-tinyipa-debian-bullseye
Expand Down
8 changes: 4 additions & 4 deletions zuul.d/project.yaml
Expand Up @@ -16,8 +16,8 @@
- bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
- bifrost-integration-redfish-vmedia-uefi-centos-9
- bifrost-integration-redfish-vmedia-uefi-debian-bookworm
- bifrost-integration-noinspector-centos-9
- bifrost-integration-noinspector-ubuntu-jammy
- bifrost-integration-inspector-centos-9
- bifrost-integration-inspector-ubuntu-jammy
- bifrost-upgrade-ubuntu-jammy
- bifrost-upgrade-keystone-centos9
# Non-voting jobs
Expand Down Expand Up @@ -66,8 +66,8 @@
- bifrost-integration-redfish-vmedia-uefi-ubuntu-jammy
- bifrost-integration-redfish-vmedia-uefi-centos-9
- bifrost-integration-redfish-vmedia-uefi-debian-bookworm
- bifrost-integration-noinspector-centos-9
- bifrost-integration-noinspector-ubuntu-jammy
- bifrost-integration-inspector-centos-9
- bifrost-integration-inspector-ubuntu-jammy
- bifrost-upgrade-ubuntu-jammy
- bifrost-upgrade-keystone-centos9
experimental:
Expand Down

0 comments on commit dcbf1d9

Please sign in to comment.