editing playbooks and config

Author: rocky Cloud User

etc/kayobe/environments/ci-aio/controllers.yml

@@ -4,7 +4,8 @@
 
 # User with which to access the controllers via SSH during bootstrap, in order
 # to setup the Kayobe user account. Default is {{ os_distribution }}.
-controller_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
+#controller_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
+controller_bootstrap_user: 'rocky'
 
 controller_extra_network_interfaces:
   - ethernet

etc/kayobe/environments/ci-aio/stackhpc.yml

@@ -1,3 +1,3 @@
 ---
 
-stackhpc_enable_cis_benchmark_hardening_hook: true
+stackhpc_enable_cis_benchmark_hardening_hook: false

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-1-check-bmc-up.yml

@@ -52,7 +52,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "https://{{ ironic_driver_info['redfish_address'] }}"
+            url: "{{ ironic_driver_info['redfish_address'] + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-2-ensure-redfish-inspect.yml

@@ -34,7 +34,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "https://{{ ironic_driver_info['redfish_address'] }}"
+            url: "{{ ironic_driver_info['redfish_address'] + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-3-ensure-agent-inspect.yml

@@ -11,7 +11,7 @@
     - baremetal
   vars:
     venv: "{{ virtualenv_path }}/openstack-cli"
-    controller_host: localhost
+    controller_host: controller0
 
   tasks:
     - name: Show and check baremetal node
@@ -34,7 +34,7 @@
 
         - name: Check BMC is up
           ansible.builtin.uri:
-            url: "https://{{ ironic_driver_info['redfish_address'] }}"
+            url: "{{ ironic_driver_info['redfish_address'] + '/redfish/v1' }}"
             method: GET
             status_code: 200
             validate_certs: false
@@ -108,7 +108,6 @@
             cacert: "{{ openstack_cacert | default(omit, true) }}"
             interface: "{{ openstack_interface | default(omit, true) }}"
           register: bmport
-          delegate_to: localhost
           when: kayobe_agent_inspect_done == ""
 
         - name: Disable PXE on all baremetal ports

etc/kayobe/environments/stackhpc-baremetal/inventory/group_vars/baremetal-redfish/ironic

@@ -4,15 +4,16 @@ ironic_driver: redfish
 
 ironic_driver_info:
   redfish_system_id: "{{ ironic_redfish_system_id }}"
-  redfish_address: "{{ ironic_redfish_address }}"
+  redfish_address: "http://192.168.33.3:34343"
   redfish_username: "{{ ironic_redfish_username }}"
   redfish_password: "{{ ironic_redfish_password }}"
   redfish_verify_ca: "{{ ironic_redfish_verify_ca }}"
 
 ironic_redfish_verify_ca: false
-ironic_redfish_address: "{{ redfish_address | default('') }}"
+ironic_redfish_address: "{{ redfish_address }}"
 ironic_redfish_system_id:
 ironic_redfish_username: "{{ secrets_redfish_baremetal_username | default('') }}"
 ironic_redfish_password: "{{ secrets_redfish_baremetal_password | default('') }}"
 ironic_resource_class: "example_resource_class"
 ironic_capabilities: "boot_option:local,boot_mode:uefi"
+ironic_properties: {}

etc/kayobe/environments/stackhpc-baremetal/kolla.yml

@@ -0,0 +1,3 @@
+---
+
+kolla_enable_ironic: true

etc/kayobe/environments/stackhpc-baremetal/kolla/config/ironic/ironic.conf

@@ -0,0 +1,74 @@
+{% raw %}
+{% set internal_net_ip = (internal_net_ips).get(inventory_hostname) %}
+
+[DEFAULT]
+# avoid checksum issues, do convert on deploy node
+force_raw_images = false
+# Avoid some timeouts of heartbeats and vif deletes
+rpc_response_timeout = 360
+
+[conductor]
+automated_clean = true
+bootloader = file:///var/lib/ironic/httpboot/esp.img
+deploy_kernel = file:///var/lib/ironic/httpboot/ironic-agent.kernel
+deploy_ramdisk = file:///var/lib/ironic/httpboot/ironic-agent.initramfs
+
+# We have busy conductors failing to heartbeat
+# Default is 10 secs
+heartbeat_interval = 30
+# Default is 60 seconds
+heartbeat_timeout = 360
+sync_local_state_interval = 360
+
+# Normally this is 100. We see eventlet threads
+# not making much progress, to for saftey reduce
+# this by half, should leave work on rabbit queu
+workers_pool_size = 50
+# Normally this is 8, keep it same
+period_max_workers = 8
+
+# Increase power sync interval to reduce load
+sync_power_state_interval = 120
+power_failure_recovery_interval = 120
+# Stop checking for orphan allocations for now
+check_allocations_interval = 120
+
+# Wait much longer before provision timeout check, to reduce background load
+# The default is 60 seconds
+check_provision_state_interval = 120
+check_rescue_state_interval = 120
+
+[database]
+# Usually this is 50, reduce to stop DB connection timeouts
+# and instead just make eventlet threads wait a bit longer
+max_overflow = 5
+# By default this is 30 seconds, but as we reduce
+# the pool overflow, some people will need to wait longer
+pool_timeout = 60
+
+[neutron]
+# Increase the neutron client timeout to allow for the slow management
+# switches.
+timeout = 300
+request_timeout = 300
+
+[glance]
+# Retry image download at least once if failure
+num_retries = 1
+
+[neutron]
+inspection_network = "{{ inspection_net_name | default('inspect-net' )}}"
+
+[redfish]
+kernel_append_params = nofb nomodeset vga=normal console=tty0 console=ttyS0,115200n8 ipa-insecure=1 {% if internal_net_ip %}ipa-ntp-server={{ internal_net_ip }}{% endif %}
+
+[inspector]
+extra_kernel_params = ipa-collect-lldp=1 ipa-inspection-collectors=default,logs,pci-devices ipa-insecure=1
+hooks = ramdisk-error,validate-interfaces,ports,local-link-connection,parse-lldp,root-device,cpu-capabilities,architecture
+add_ports = all
+
+[pxe]
+# 100GB size 4 weeks ttl
+image_cache_size = 95367
+image_cache_ttl = 40320
+{% endraw %}

etc/kayobe/environments/stackhpc-sushy-baremetal/inventory/group_vars/sushy-libvirt/ironic

@@ -2,6 +2,8 @@
 
 bikolla_enable_secureboot: false
 
-ironic_redfish_system_id: "{{ inventory_hostname | to_uuid }}"
+ironic_redfish_system_id: "{{ '/redfish/v1/Systems/' + inventory_hostname | to_uuid }}"
 
 redifsh_address: "http://192.168.33.3:34343"
+ironic_redfish_address: "192.168.33.3:34343"
+ironic_flat_provisioning_network: provision-net