Skip to content

Commit cf98ced

Browse files
committed
use swift backend for inspector
1 parent e42c04f commit cf98ced

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

kolla/defaults.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ ironic_console_serial_speed: 115200n8
185185
encoded_ironic_pxe_root_password: "{{ ironic_pxe_root_password | password_hash('md5') | regex_replace( '(\\$)', '$\\1') }}"
186186
ironic_kernel_append_params: nofb vga=normal console=tty0 console=ttyS0,{{ ironic_console_serial_speed }} rootpwd="{{ encoded_ironic_pxe_root_password }}"
187187

188+
ironic_inspector_store: database
189+
188190
# settings for ironic inspector
189191

190192
# don't run standalone, always depend on glance+neutron+ironic.

kolla/node_custom_config/ironic-inspector.conf

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ update_pxe_enabled = true
2525
# The storage backend for storing introspection data. Possible values
2626
# are: 'none', 'database' and 'swift'. If set to 'none', introspection
2727
# data will not be stored. (string value)
28-
store_data = database
28+
store_data = "{{ ironic_inspector_store }}"
2929

3030
# https://docs.openstack.org/ironic-inspector/2023.1/configuration/ironic-inspector.html#processing.processing_hooks
3131
# for choices, see https://docs.openstack.org/ironic-inspector/2023.1/user/usage.html#plugins
@@ -34,4 +34,25 @@ processing_hooks = $default_processing_hooks,extra_hardware,lldp_basic,accelerat
3434

3535
[capabilities]
3636
# Whether to store the boot mode (BIOS or UEFI).
37-
boot_mode = true
37+
boot_mode = true
38+
39+
{% if ironic_inspector_store == "swift" %}
40+
[swift]
41+
auth_url = {{ keystone_internal_url }}
42+
auth_type = password
43+
project_domain_id = {{ default_project_domain_id }}
44+
user_domain_id = {{ default_user_domain_id }}
45+
project_name = service
46+
username = {{ ironic_inspector_keystone_user }}
47+
password = {{ ironic_inspector_keystone_password }}
48+
valid_interfaces = internal
49+
region_name = {{ openstack_region_name }}
50+
51+
# Default Swift container to use when creating objects. (string value)
52+
container = ironic-inspector
53+
54+
# Number of seconds that the Swift object will last before being
55+
# deleted. (set to 0 to never delete the object). (integer value)
56+
#delete_after = 0
57+
58+
{% endif %}

kolla/node_custom_config/ironic.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ default_boot_option = local
5656
require_managed_boot = True
5757
# passed to ironic-python-agent, see :
5858
# https://docs.openstack.org/ironic-python-agent/latest/admin/how_it_works.html#inspection
59-
extra_kernel_params = "ipa-inspection-collectors=default,pci-devices,dmi-decode,numa-topology,logs ipa-collect-lldp=1"
59+
extra_kernel_params = "ipa-inspection-collectors=default,pci-devices,dmi-decode,numa-topology,extra-hardware,logs ipa-collect-lldp=1"
6060

6161
[neutron]
6262
cleaning_network = "{{ ironic_cleaning_network }}"

0 commit comments

Comments
 (0)