diff --git a/doc/source/user/architecture.rst b/doc/source/user/architecture.rst index 99fc257e..eae5e982 100644 --- a/doc/source/user/architecture.rst +++ b/doc/source/user/architecture.rst @@ -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. diff --git a/playbooks/ci/run.yaml b/playbooks/ci/run.yaml index d770c6df..90c71e1d 100644 --- a/playbooks/ci/run.yaml +++ b/playbooks/ci/run.yaml @@ -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 }}" diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index d3fa988f..59091f92 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -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 diff --git a/playbooks/roles/bifrost-keystone-client-config/defaults/main.yml b/playbooks/roles/bifrost-keystone-client-config/defaults/main.yml index c3a3ac73..56273bc8 100644 --- a/playbooks/roles/bifrost-keystone-client-config/defaults/main.yml +++ b/playbooks/roles/bifrost-keystone-client-config/defaults/main.yml @@ -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 }}" diff --git a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml index a355587d..b0540444 100644 --- a/playbooks/roles/bifrost-prep-for-install/defaults/main.yml +++ b/playbooks/roles/bifrost-prep-for-install/defaults/main.yml @@ -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 diff --git a/releasenotes/notes/new-inspection-441b578de2206415.yaml b/releasenotes/notes/new-inspection-441b578de2206415.yaml index 282f85be..93b056d8 100644 --- a/releasenotes/notes/new-inspection-441b578de2206415.yaml +++ b/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 @@ -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. diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh index 738e613f..437d177a 100755 --- a/scripts/test-bifrost.sh +++ b/scripts/test-bifrost.sh @@ -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 @@ -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 @@ -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 diff --git a/zuul.d/bifrost-jobs.yaml b/zuul.d/bifrost-jobs.yaml index 92fc3f1a..64c3bf64 100644 --- a/zuul.d/bifrost-jobs.yaml +++ b/zuul.d/bifrost-jobs.yaml @@ -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 @@ -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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index dd973c17..bef27c66 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -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 @@ -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: