diff --git a/environments/kolla/configuration.yml b/environments/kolla/configuration.yml index 18d88f3..c5181d9 100644 --- a/environments/kolla/configuration.yml +++ b/environments/kolla/configuration.yml @@ -34,19 +34,25 @@ openstack_service_workers: 2 libvirt_enable_sasl: "no" # ironic -# ironic_dnsmasq_interface: "eno2" -# ironic_cleaning_network: "public" -# ironic_dnsmasq_dhcp_ranges: -# - range: "192.168.88.100,192.168.88.110" -# routers: "192.168.88.1" +ironic_cleaning_network: "public" + +# No DNS is usable in the introspect network +ironic_inspector_internal_endpoint: https://192.168.16.254:5050 +ironic_dnsmasq_dhcp_ranges: + - range: "192.168.17.100,192.168.17.110" + routers: "192.168.17.10" + +# No trusted CA is used in the Cloud in a box +ironic_inspector_kernel_cmdline_extras: + - ipa-insecure=True # neutron neutron_plugin_agent: ovn neutron_ovn_availability_zones: - nova -# NOTE: Disable the debugging logs for Libvirt as Libvirt writes a lot of logs -# that are not of interest. +# We disable the debugging logs for Libvirt as Libvirt writes a lot of logs +# that are not of interest. nova_libvirt_logging_debug: "no" # nova diff --git a/environments/kolla/files/overlays/ironic.conf b/environments/kolla/files/overlays/ironic.conf new file mode 100644 index 0000000..7dc4fc0 --- /dev/null +++ b/environments/kolla/files/overlays/ironic.conf @@ -0,0 +1,16 @@ +[DEFAULT] + +# DOCS: https://docs.openstack.org/ironic/latest/install/enabling-drivers.html +# ALL TYPES: https://opendev.org/openstack/ironic/src/branch/master/setup.cfg + +enabled_hardware_types = ipmi,redfish +enabled_boot_interfaces = ipxe,redfish-virtual-media +enabled_console_interfaces = ipmitool-socat,no-console +enabled_deploy_interfaces = direct,ansible +enabled_inspect_interfaces = inspector,redfish,no-inspect +enabled_management_interfaces = ipmitool,redfish +enabled_network_interfaces = flat,neutron +enabled_power_interfaces = ipmitool,redfish +enabled_raid_interfaces = no-raid,redfish +enabled_storage_interfaces = cinder,noop +enabled_vendor_interfaces = ipmitool,no-vendor diff --git a/environments/openstack/playbook-bootstrap-edge.yml b/environments/openstack/playbook-bootstrap-edge.yml index d3809f6..da468cf 100644 --- a/environments/openstack/playbook-bootstrap-edge.yml +++ b/environments/openstack/playbook-bootstrap-edge.yml @@ -46,7 +46,6 @@ name: subnet-public network_name: public cidr: 192.168.112.0/24 - enable_dhcp: false allocation_pool_start: 192.168.112.100 allocation_pool_end: 192.168.112.200 gateway_ip: 192.168.112.10 diff --git a/environments/openstack/playbook-bootstrap-sandbox.yml b/environments/openstack/playbook-bootstrap-sandbox.yml index 5c0c30d..88a1a58 100644 --- a/environments/openstack/playbook-bootstrap-sandbox.yml +++ b/environments/openstack/playbook-bootstrap-sandbox.yml @@ -49,7 +49,6 @@ name: subnet-public network_name: public cidr: 192.168.112.0/24 - enable_dhcp: false allocation_pool_start: 192.168.112.100 allocation_pool_end: 192.168.112.200 gateway_ip: 192.168.112.10 diff --git a/inventory/group_vars/generic/kolla.yml b/inventory/group_vars/generic/kolla.yml index 71ae673..8761596 100644 --- a/inventory/group_vars/generic/kolla.yml +++ b/inventory/group_vars/generic/kolla.yml @@ -5,3 +5,5 @@ network_interface: "{{ network_internal_interface }}" neutron_external_interface: "{{ network_workload_interface }}" tunnel_interface: "{{ network_internal_interface }}" + +ironic_dnsmasq_interface: "{{ network_metal_interface }}" diff --git a/inventory/group_vars/generic/network.yml b/inventory/group_vars/generic/network.yml index da199fb..558bfe4 100644 --- a/inventory/group_vars/generic/network.yml +++ b/inventory/group_vars/generic/network.yml @@ -1,10 +1,15 @@ --- -########################################################## -# network +# The network_*_interface parameters are only used within the +# Cloud in a Box inventory for simplification. -network_internal_interface: vlan100 network_mgmt_interface: eno1 + +network_internal_interface: vlan100 network_workload_interface: vlan101 +network_metal_interface: vlan102 + +########################################################## +# network network_type: netplan @@ -21,6 +26,11 @@ network_vlans: vlan101: id: 101 link: "{{ network_mgmt_interface }}" + vlan102: + id: 102 + link: "{{ network_mgmt_interface }}" + addresses: + - "192.168.17.{{ node_id }}/24" network_dispatcher_scripts: - src: /opt/configuration/environments/manager/files/osism.sh