Browse Source

Synchronise configuration file defaults with kayobe

Mark Goddard 2 years ago
parent
commit
449621a734

+ 4
- 0
etc/kayobe/bifrost.yml View File

@@ -59,6 +59,10 @@
59 59
 # Ironic inspector IPMI password to set.
60 60
 #kolla_bifrost_inspector_ipmi_password:
61 61
 
62
+# Ironic inspector network interface name on which to check for an LLDP switch
63
+# port description to use as the node's name.
64
+#kolla_bifrost_inspector_lldp_switch_port_interface:
65
+
62 66
 # Ironic inspector deployment kernel location.
63 67
 #kolla_bifrost_inspector_deploy_kernel:
64 68
 

+ 19
- 0
etc/kayobe/bmc.yml View File

@@ -0,0 +1,19 @@
1
+---
2
+###############################################################################
3
+# Configuration of Baseboard Management Controllers (BMCs).
4
+
5
+# Type of host's BMC. Currently only idrac is supported.
6
+#bmc_type:
7
+
8
+# Address to use to access a host's BMC via IPMI.
9
+#ipmi_address:
10
+
11
+# Username to use to access a host's BMC via IPMI.
12
+#ipmi_username:
13
+
14
+# Password to use to access a host's BMC via IPMI.
15
+#ipmi_password:
16
+
17
+###############################################################################
18
+# Dummy variable to allow Ansible to accept this file.
19
+workaround_ansible_issue_8743: yes

+ 30
- 0
etc/kayobe/controllers.yml View File

@@ -15,6 +15,36 @@
15 15
 # List of extra networks to which controller nodes are attached.
16 16
 #controller_extra_network_interfaces:
17 17
 
18
+###############################################################################
19
+# Controller node BIOS configuration.
20
+
21
+# Dict of controller BIOS options. Format is same as that used by stackhpc.drac
22
+# role.
23
+#controller_bios_config:
24
+
25
+# Dict of default controller BIOS options. Format is same as that used by
26
+# stackhpc.drac role.
27
+#controller_bios_config_default:
28
+
29
+# Dict of additional controller BIOS options. Format is same as that used by
30
+# stackhpc.drac role.
31
+#controller_bios_config_extra:
32
+
33
+###############################################################################
34
+# Controller node RAID configuration.
35
+
36
+# List of controller RAID volumes. Format is same as that used by stackhpc.drac
37
+# role.
38
+#controller_raid_config:
39
+
40
+# List of default controller RAID volumes. Format is same as that used by
41
+# stackhpc.drac role.
42
+#controller_raid_config_default:
43
+
44
+# List of additional controller RAID volumes. Format is same as that used by
45
+# stackhpc.drac role.
46
+#controller_raid_config_extra:
47
+
18 48
 ###############################################################################
19 49
 # Controller node LVM configuration.
20 50
 

+ 16
- 0
etc/kayobe/dell-switch-bmp.yml View File

@@ -0,0 +1,16 @@
1
+---
2
+# Dell Switch Bare Metal Provisioning (BMP) configuration.
3
+
4
+# List of images to provide a BMP configuration for.
5
+# Each item should be a dict with the following keys:
6
+# url: URL of the image to download.
7
+# dest: Name of the file to download the image to.
8
+# match: dnsmasq match rule to match hosts against.
9
+# tag: dnsmasq tag to apply to matching hosts.
10
+# checksum: optional checksum of image, in format required for Ansible's
11
+#           get_url module.
12
+#dell_switch_bmp_images:
13
+
14
+###############################################################################
15
+# Dummy variable to allow Ansible to accept this file.
16
+workaround_ansible_issue_8743: yes

+ 46
- 0
etc/kayobe/idrac.yml View File

@@ -0,0 +1,46 @@
1
+---
2
+###############################################################################
3
+# iDRAC configuration.
4
+
5
+# Default username for iDRACs.
6
+#idrac_default_username:
7
+
8
+# Default password for iDRACs.
9
+#idrac_default_password:
10
+
11
+# Default IP address for iDRACs.
12
+#idrac_default_ip:
13
+
14
+# Dict mapping host description (as found in switch interface configuration) to
15
+# IP address of the iDRAC for that host.
16
+#idrac_network_ips:
17
+
18
+# Gateway IP address for iDRAC network.
19
+#idrac_network_gateway:
20
+
21
+# IP netmask for iDRAC network.
22
+#idrac_network_netmask:
23
+
24
+# VLAN for iDRAC network.
25
+#idrac_network_vlan:
26
+
27
+# ID of VLAN to use for bootstrapping iDRACs.
28
+#idrac_bootstrap_vlan:
29
+
30
+# Name of network namespace on controller to use for bootstrapping iDRACs.
31
+#idrac_bootstrap_net_namespace:
32
+
33
+# Controller group to use for bootstrapping iDRACs.
34
+#idrac_bootstrap_controller_group:
35
+
36
+# Base network interface on controller to use for bootstrapping iDRACs.
37
+#idrac_bootstrap_controller_interface:
38
+
39
+# VLAN network interface on controller to create for bootstrapping iDRACs.
40
+#idrac_bootstrap_controller_vlan_interface:
41
+
42
+# IP address of controller to use for bootstrapping iDRACs.
43
+#idrac_bootstrap_controller_ip:
44
+
45
+# Name of an Ansible group containing switches forming the iDRAC network.
46
+#idrac_bootstrap_switch_group:

+ 29
- 4
etc/kayobe/inspector.yml View File

@@ -17,7 +17,13 @@
17 17
 # Whether inspector should manage the firewall.
18 18
 #inspector_manage_firewall:
19 19
 
20
-# List of of inspector processing plugins.
20
+# List of of default inspector processing plugins.
21
+#inspector_processing_hooks_default:
22
+
23
+# List of of additional inspector processing plugins.
24
+#inspector_processing_hooks_extra:
25
+
26
+# List of of additional inspector processing plugins.
21 27
 #inspector_processing_hooks:
22 28
 
23 29
 # Which MAC addresses to add as ports during introspection. One of 'all',
@@ -67,19 +73,38 @@
67 73
 # Ironic inspector rule to set the interface on which the node PXE booted.
68 74
 #inspector_rule_set_pxe_interface_mac:
69 75
 
70
-# Ironic inspector rule to set the node's name from eno3's LLDP switch port
71
-# description.
72
-#inspector_rule_eno3_lldp_switch_port_desc_to_name:
76
+# Ironic inspector rule to set the node's name from an interface's LLDP switch
77
+# port description.
78
+#inspector_rule_lldp_switch_port_desc_to_name:
73 79
 
74 80
 # Ironic inspector rule to save introspection data to the node.
75 81
 #inspector_rule_save_data:
76 82
 
83
+# List of default ironic insepctor rules.
84
+#inspector_rules_default:
85
+
77 86
 # List of additional ironic inspector rules.
78 87
 #inspector_rules_extra:
79 88
 
80 89
 # List of all ironic inspector rules.
81 90
 #inspector_rules:
82 91
 
92
+###############################################################################
93
+# Dell switch LLDP workaround configuration.
94
+
95
+# Some Dell switch OSs (including Dell Network OS 9.10(0.1)) do not support
96
+# sending interface port description TLVs correctly. Instead of sending the
97
+# interface description, they send the interface name (e.g. TenGigabitEthernet
98
+# 1/1/1). This breaks the discovery process which relies on Ironic node
99
+# introspection data containing the node's name in the interface port
100
+# description. We work around this here by creating an introspection rule for
101
+# each ironic node that matches against the switch system and the relevant
102
+# interface name, then sets the node's name appropriately.
103
+
104
+# Ansible group containing switch hosts to which the workaround should be
105
+# applied.
106
+#inspector_dell_switch_lldp_workaround_group:
107
+
83 108
 ###############################################################################
84 109
 # Dummy variable to allow Ansible to accept this file.
85 110
 workaround_ansible_issue_8743: yes

+ 2
- 10
etc/kayobe/inventory/group_vars/switches/interfaces View File

@@ -5,16 +5,8 @@
5 5
 # Interface configuration.
6 6
 
7 7
 # Interface configuration. Dict mapping switch interface names to configuration
8
-# dicts. Each dict contains a description item and the name of a network which
9
-# is used to lookup a variable containing interface config for ports on that
10
-# network (switch_interface_config_<network>). Each dict can also have a 
11
-# 'config' item which should contain a list of additional per-interface
12
-# configuration.
8
+# dicts. Each dict contains a description item and a 'config' item which should
9
+# contain a list of per-interface configuration.
13 10
 # Generally this should be configured on a per-switch basis via a host_vars
14 11
 # file.
15 12
 switch_interface_config: {}
16
-
17
-# Example of an interface configuration variable for a network, referenced by
18
-# the 'network' item of an interface in 'switch_interface_config'.
19
-#switch_interface_config_example_net:
20
-#  - switchport access vlan 42

+ 33
- 0
etc/kayobe/ipa.yml View File

@@ -0,0 +1,33 @@
1
+---
2
+# Ironic Python Agent (IPA) configuration.
3
+
4
+###############################################################################
5
+# Ironic Python Agent (IPA) images configuration.
6
+
7
+# Name of Ironic deployment kernel image to register in Glance.
8
+#ipa_images_kernel_name:
9
+
10
+# URL of Ironic deployment kernel image to download.
11
+#ipa_images_kernel_url:
12
+
13
+# Name of Ironic deployment ramdisk image to register in Glance.
14
+#ipa_images_ramdisk_name:
15
+
16
+# URL of Ironic deployment ramdisk image to download.
17
+#ipa_images_ramdisk_url:
18
+
19
+###############################################################################
20
+# Ironic Python Agent (IPA) deployment configuration.
21
+
22
+# List of extra kernel parameters to enable LLDP collection.
23
+#ipa_kernel_options_collect_lldp:
24
+
25
+# List of extra kernel parameters to enable all inspector collectors.
26
+#ipa_kernel_options_inspection_collectors_all:
27
+
28
+# List of extra kernel parameters to enable all inspector benchmarks.
29
+#ipa_kernel_options_inspection_benchmarks_all:
30
+
31
+###############################################################################
32
+# Dummy variable to allow Ansible to accept this file.
33
+workaround_ansible_issue_8743: yes

+ 104
- 0
etc/kayobe/ironic.yml View File

@@ -0,0 +1,104 @@
1
+---
2
+###############################################################################
3
+# Ironic configuration.
4
+
5
+# List of enabled Ironic drivers.
6
+#kolla_ironic_drivers:
7
+
8
+# Specify the list of hardware types to load during service initialization.
9
+#kolla_ironic_enabled_hardware_types:
10
+
11
+# Specify the list of boot interfaces to load during service initialization.
12
+#kolla_ironic_enabled_boot_interfaces:
13
+
14
+# Default boot interface to be used for nodes that do not have boot_interface
15
+# field set.
16
+#kolla_ironic_default_boot_interface:
17
+
18
+# Specify the list of console interfaces to load during service initialization.
19
+#kolla_ironic_enabled_console_interfaces:
20
+
21
+# Default console interface to be used for nodes that do not have
22
+# console_interface field set.
23
+#kolla_ironic_default_console_interface:
24
+
25
+# Specify the list of deploy interfaces to load during service initialization.
26
+#kolla_ironic_enabled_deploy_interfaces:
27
+
28
+# Default deploy interface to be used for nodes that do not have
29
+# deploy_interface field set.
30
+#kolla_ironic_default_deploy_interface:
31
+
32
+# Specify the list of inspect interfaces to load during service initialization.
33
+#kolla_ironic_enabled_inspect_interfaces:
34
+
35
+# Default inspect interface to be used for nodes that do not have
36
+# inspect_interface field set.
37
+#kolla_ironic_default_inspect_interface:
38
+
39
+# Specify the list of management interfaces to load during service
40
+# initialization.
41
+#kolla_ironic_enabled_management_interfaces:
42
+
43
+# Default management interface to be used for nodes that do not have
44
+# management_interface field set.
45
+#kolla_ironic_default_management_interface:
46
+
47
+# Specify the list of network interfaces to load during service initialization.
48
+#kolla_ironic_enabled_network_interfaces:
49
+
50
+# Default network interface to be used for nodes that do not have
51
+# network_interface field set.
52
+#kolla_ironic_default_network_interface:
53
+
54
+# Specify the list of power interfaces to load during service initialization.
55
+#kolla_ironic_enabled_power_interfaces:
56
+
57
+# Default power interface to be used for nodes that do not have power_interface
58
+# field set.
59
+#kolla_ironic_default_power_interface:
60
+
61
+# Specify the list of raid interfaces to load during service initialization.
62
+#kolla_ironic_enabled_raid_interfaces:
63
+
64
+# Default raid interface to be used for nodes that do not have
65
+# raid_interface field set.
66
+#kolla_ironic_default_raid_interface:
67
+
68
+# Specify the list of storage interfaces to load during
69
+# service initialization.
70
+#kolla_ironic_enabled_storage_interfaces:
71
+
72
+# Default storage interface to be used for nodes that do not
73
+# have storage_interface field set.
74
+#kolla_ironic_default_storage_interface:
75
+
76
+# Specify the list of vendor interfaces to load during service initialization.
77
+#kolla_ironic_enabled_vendor_interfaces:
78
+
79
+# Default vendor interface to be used for nodes that do not have
80
+# vendor_interface field set.
81
+#kolla_ironic_default_vendor_interface:
82
+
83
+# Default boot option to use when no boot option is requested in node's
84
+# driver_info.
85
+#kolla_ironic_default_boot_option:
86
+
87
+# Name of the Neutron network to use for cleaning.
88
+#kolla_ironic_cleaning_network:
89
+
90
+# Name of the Neutron network to use for provisioning.
91
+#kolla_ironic_provisioning_network:
92
+
93
+# List of default kernel parameters to append for baremetal PXE boot.
94
+#kolla_ironic_pxe_append_params_default:
95
+
96
+# List of additional kernel parameters to append for baremetal PXE boot.
97
+#kolla_ironic_pxe_append_params_extra:
98
+
99
+# List of kernel parameters to append for baremetal PXE boot.
100
+#kolla_ironic_pxe_append_params:
101
+
102
+###############################################################################
103
+# Dummy variable to allow Ansible to accept this file.
104
+workaround_ansible_issue_8743: yes

+ 6
- 0
etc/kayobe/kolla.yml View File

@@ -49,6 +49,12 @@
49 49
 #     reference: master
50 50
 #kolla_sources:
51 51
 
52
+###############################################################################
53
+# Kolla image build configuration.
54
+
55
+# Dict mapping Jinja2 block names in kolla's Docker images to their contents.
56
+#kolla_build_blocks:
57
+
52 58
 ###############################################################################
53 59
 # Kolla-ansible configuration.
54 60
 

+ 14
- 0
etc/kayobe/networks.yml View File

@@ -36,15 +36,23 @@
36 36
 # provision_oc_net_cidr:
37 37
 # provision_oc_net_allocation_pool_start:
38 38
 # provision_oc_net_allocation_pool_end:
39
+# provision_oc_net_inspection_allocation_pool_start:
40
+# provision_oc_net_inspection_allocation_pool_end:
39 41
 # provision_oc_net_gateway:
40 42
 # provision_oc_net_vlan:
43
+# provision_oc_net_mtu:
41 44
 
42 45
 # Workload provisioning network IP information.
43 46
 # provision_wl_net_cidr:
44 47
 # provision_wl_net_allocation_pool_start:
45 48
 # provision_wl_net_allocation_pool_end:
49
+# provision_wl_net_inspection_allocation_pool_start:
50
+# provision_wl_net_inspection_allocation_pool_end:
51
+# provision_wl_net_neutron_allocation_pool_start:
52
+# provision_wl_net_neutron_allocation_pool_end:
46 53
 # provision_wl_net_gateway:
47 54
 # provision_wl_net_vlan:
55
+# provision_wl_net_mtu:
48 56
 
49 57
 # Internal network IP information.
50 58
 # internal_net_vip_address:
@@ -54,6 +62,7 @@
54 62
 # internal_net_allocation_pool_end:
55 63
 # internal_net_gateway:
56 64
 # internal_net_vlan:
65
+# internal_net_mtu:
57 66
 
58 67
 # External network IP information.
59 68
 # external_net_vip_address:
@@ -61,8 +70,11 @@
61 70
 # external_net_cidr:
62 71
 # external_net_allocation_pool_start:
63 72
 # external_net_allocation_pool_end:
73
+# external_net_neutron_allocation_pool_start:
74
+# external_net_neutron_allocation_pool_end:
64 75
 # external_net_gateway:
65 76
 # external_net_vlan:
77
+# external_net_mtu:
66 78
 
67 79
 # Storage network IP information.
68 80
 # storage_net_cidr:
@@ -70,6 +82,7 @@
70 82
 # storage_net_allocation_pool_end:
71 83
 # storage_net_gateway:
72 84
 # storage_net_vlan:
85
+# storage_net_mtu:
73 86
 
74 87
 # Storage management network IP information.
75 88
 # storage_mgmt_net_cidr:
@@ -77,6 +90,7 @@
77 90
 # storage_mgmt_net_allocation_pool_end:
78 91
 # storage_mgmt_net_gateway:
79 92
 # storage_mgmt_net_vlan:
93
+# storage_mgmt_net_mtu:
80 94
 
81 95
 ###############################################################################
82 96
 # Network virtual patch link configuration.

+ 45
- 0
etc/kayobe/neutron.yml View File

@@ -0,0 +1,45 @@
1
+---
2
+###############################################################################
3
+# Neutron configuration.
4
+
5
+# List of Neutron ML2 mechanism drivers to use.
6
+#kolla_neutron_ml2_mechanism_drivers:
7
+
8
+# List of Neutron ML2 type drivers to use.
9
+#kolla_neutron_ml2_type_drivers:
10
+
11
+# List of Neutron ML2 tenant network types to use.
12
+#kolla_neutron_ml2_tenant_network_types:
13
+
14
+# List of Neutron ML2 network VLAN ranges to use. Each item should be a dict
15
+# containing the following items:
16
+# physical_network: The physical network
17
+# min: Minimum of allowed VLAN range (optional)
18
+# max: Maximum of allowed VLAN range (optional)
19
+#kolla_neutron_ml2_network_vlan_ranges:
20
+
21
+# List of switches to configure for use by genericswitch ML2 mechanism driver.
22
+# Each item should be a dict containing the following items:
23
+# name: Hostname of the switch
24
+# ip: IP address on which to reach the switch
25
+# username: SSH username
26
+# password: SSH password (optional)
27
+# key_file: SSH key file (optional)
28
+# secret: SSH secret (optional)
29
+#kolla_neutron_ml2_generic_switches:
30
+
31
+# List of Ansible hosts representing switches to configure for use by
32
+# genericswitch ML2 mechanism driver. These switches will be appended to
33
+# kolla_neutron_ml2_generic_switches and their configuration will be determined
34
+# by the following host variables:
35
+# name: inventory_hostname
36
+# ip: ansible_host
37
+# username: ansible_user
38
+# password: ansible_ssh_pass
39
+# key_file: not currently supported
40
+# secret: not currently supported
41
+#kolla_neutron_ml2_generic_switch_hosts:
42
+
43
+###############################################################################
44
+# Dummy variable to allow Ansible to accept this file.
45
+workaround_ansible_issue_8743: yes

Loading…
Cancel
Save