config edits

claudia-lola · rocky Cloud User · commit a7df15626c99 · 2025-11-11T13:18:00.000Z
diff --git a/etc/kayobe/environments/ci-aio/stackhpc.yml b/etc/kayobe/environments/ci-aio/stackhpc.yml
@@ -1,3 +1,3 @@
 ---
 
-stackhpc_enable_cis_benchmark_hardening_hook: false
+stackhpc_enable_cis_benchmark_hardening_hook: true
diff --git a/etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-4-clean.yml b/etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-4-clean.yml
@@ -35,7 +35,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
diff --git a/etc/kayobe/environments/stackhpc-baremetal/kolla.yml b/etc/kayobe/environments/stackhpc-baremetal/kolla.yml
@@ -1,3 +1,5 @@
 ---
 
-kolla_enable_ironic: true
+kolla_enable_ironic: true
+kolla_enable_ironic_dnsmasq: false
+kolla_enable_ironic_inspector: false
diff --git a/etc/kayobe/environments/stackhpc-baremetal/kolla/config/ironic.conf b/etc/kayobe/environments/stackhpc-baremetal/kolla/config/ironic.conf
@@ -1,5 +1,5 @@
 {% raw %}
-{% set internal_net_ip = (internal_net_ips).get(inventory_hostname) %}
+{% set internal_net_ip = (aio_ips).get(inventory_hostname) %}
 
 [DEFAULT]
 # avoid checksum issues, do convert on deploy node
diff --git a/etc/kayobe/environments/stackhpc-baremetal/kolla/ironic/ironic.conf b/etc/kayobe/environments/stackhpc-baremetal/kolla/ironic/ironic.conf
diff --git a/etc/kayobe/environments/stackhpc-sushy-baremetal/stackhpc.yml b/etc/kayobe/environments/stackhpc-sushy-baremetal/stackhpc.yml
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
@@ -539,6 +539,8 @@ kolla_overcloud_inventory_pass_through_host_vars_extra:
   - gpu_group_map
   - stackhpc_radosgw_usage_exporter_frontend_port
   - stackhpc_radosgw_usage_exporter_backend_port
+  - internal_net_name
+  - "{{ internal_net_name }}_ips"
 
 # List of names of host variables to pass through from kayobe hosts to
 # kolla-ansible hosts, if set. See also

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`---`
`2`	`2`
`3`		`-stackhpc_enable_cis_benchmark_hardening_hook: false`
	`3`	`+stackhpc_enable_cis_benchmark_hardening_hook: true`