Browse Source

Synchronise configuration with master

Synchronised with kayobe @ c7197f9f36.
Mark Goddard 1 year ago
parent
commit
e3468c1b27

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

@@ -9,12 +9,18 @@
9 9
 ###############################################################################
10 10
 # Network interface attachments.
11 11
 
12
+# List of networks to which controller nodes are attached.
13
+#controller_network_interfaces:
14
+
12 15
 # List of default networks to which controller nodes are attached.
13 16
 #controller_default_network_interfaces:
14 17
 
15 18
 # List of extra networks to which controller nodes are attached.
16 19
 #controller_extra_network_interfaces:
17 20
 
21
+# List of network interfaces to which network nodes are attached.
22
+#controller_network_host_network_interfaces:
23
+
18 24
 ###############################################################################
19 25
 # Controller node BIOS configuration.
20 26
 
@@ -80,6 +86,19 @@
80 86
 # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
81 87
 #controller_lvm_group_data_lv_docker_volumes_fs:
82 88
 
89
+###############################################################################
90
+# Controller node sysctl configuration.
91
+
92
+# Dict of sysctl parameters to set.
93
+#controller_sysctl_parameters:
94
+
95
+###############################################################################
96
+# Controller node user configuration.
97
+
98
+# List of users to create. This should be in a format accepted by the
99
+# singleplatform-eng.users role.
100
+#controller_users:
101
+
83 102
 ###############################################################################
84 103
 # Dummy variable to allow Ansible to accept this file.
85 104
 workaround_ansible_issue_8743: yes

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

@@ -2,6 +2,10 @@
2 2
 ###############################################################################
3 3
 # Docker configuration.
4 4
 
5
+# Name of the docker storage driver. Supported values include 'devicemapper'
6
+# and 'overlay'.
7
+#docker_storage_driver:
8
+
5 9
 # Name of the docker storage LVM volume group.
6 10
 #docker_storage_volume_group:
7 11
 

+ 11
- 0
etc/kayobe/inspector.yml View File

@@ -109,6 +109,17 @@
109 109
 # applied.
110 110
 #inspector_dell_switch_lldp_workaround_group:
111 111
 
112
+###############################################################################
113
+# Inspection store configuration.
114
+# The inspection store provides a Swift-like service for storing inspection
115
+# data which may be useful in environments without Swift.
116
+
117
+# Whether the inspection data store is enabled.
118
+#inspector_store_enabled:
119
+
120
+# Port on which the inspection data store should listen.
121
+#inspector_store_port:
122
+
112 123
 ###############################################################################
113 124
 # Dummy variable to allow Ansible to accept this file.
114 125
 workaround_ansible_issue_8743: yes

+ 6
- 0
etc/kayobe/inventory/group_vars/controllers/network-interfaces View File

@@ -5,26 +5,32 @@
5 5
 # Overcloud provisioning network IP information.
6 6
 # provision_oc_net_interface:
7 7
 # provision_oc_net_bridge_ports:
8
+# provision_oc_net_bond_slaves:
8 9
 
9 10
 # Workload provisioning network IP information.
10 11
 # provision_wl_net_interface:
11 12
 # provision_wl_net_bridge_ports:
13
+# provision_wl_net_bond_slaves:
12 14
 
13 15
 # Internal network IP information.
14 16
 # internal_net_interface:
15 17
 # internal_net_bridge_ports:
18
+# internal_net_bond_slaves:
16 19
 
17 20
 # External network IP information.
18 21
 # external_net_interface:
19 22
 # external_net_bridge_ports:
23
+# external_net_bond_slaves:
20 24
 
21 25
 # Storage network IP information.
22 26
 # storage_net_interface:
23 27
 # storage_net_bridge_ports:
28
+# storage_net_bond_slaves:
24 29
 
25 30
 # Storage management network IP information.
26 31
 # storage_mgmt_net_interface:
27 32
 # storage_mgmt_net_bridge_ports:
33
+# storage_mgmt_net_bond_slaves:
28 34
 
29 35
 ###############################################################################
30 36
 # Dummy variable to allow Ansible to accept this file.

+ 6
- 0
etc/kayobe/inventory/group_vars/seed/network-interfaces View File

@@ -5,26 +5,32 @@
5 5
 # Overcloud provisioning network IP information.
6 6
 # provision_oc_net_interface:
7 7
 # provision_oc_net_bridge_ports:
8
+# provision_oc_net_bond_slaves:
8 9
 
9 10
 # Workload provisioning network IP information.
10 11
 # provision_wl_net_interface:
11 12
 # provision_wl_net_bridge_ports:
13
+# provision_wl_net_bond_slaves:
12 14
 
13 15
 # Internal network IP information.
14 16
 # internal_net_interface:
15 17
 # internal_net_bridge_ports:
18
+# internal_net_bond_slaves:
16 19
 
17 20
 # External network IP information.
18 21
 # external_net_interface:
19 22
 # external_net_bridge_ports:
23
+# external_net_bond_slaves:
20 24
 
21 25
 # Storage network IP information.
22 26
 # storage_net_interface:
23 27
 # storage_net_bridge_ports:
28
+# storage_net_bond_slaves:
24 29
 
25 30
 # Storage management network IP information.
26 31
 # storage_mgmt_net_interface:
27 32
 # storage_mgmt_net_bridge_ports:
33
+# storage_mgmt_net_bond_slaves:
28 34
 
29 35
 ###############################################################################
30 36
 # Dummy variable to allow Ansible to accept this file.

+ 7
- 0
etc/kayobe/inventory/groups View File

@@ -7,17 +7,24 @@
7 7
 [controllers]
8 8
 # Empty group to provide declaration of controllers group.
9 9
 
10
+[network:children]
11
+# Add controllers to network group by default for backwards compatibility,
12
+# although they could be separate hosts.
13
+controllers
14
+
10 15
 [monitoring]
11 16
 # Empty group to provide declaration of monitoring group.
12 17
 
13 18
 [overcloud:children]
14 19
 controllers
20
+network
15 21
 monitoring
16 22
 
17 23
 [docker:children]
18 24
 # Hosts in this group will have Docker installed.
19 25
 seed
20 26
 controllers
27
+network
21 28
 monitoring
22 29
 
23 30
 ###############################################################################

+ 56
- 6
etc/kayobe/ipa.yml View File

@@ -20,6 +20,33 @@
20 20
 # to upper version constraint.
21 21
 #ipa_build_custom_upper_constraints:
22 22
 
23
+# List of default Diskimage Builder (DIB) elements to use when building IPA
24
+# images.
25
+#ipa_build_dib_elements_default:
26
+
27
+# List of additional Diskimage Builder (DIB) elements to use when building IPA
28
+# images.
29
+#ipa_build_dib_elements_extra:
30
+
31
+# List of Diskimage Builder (DIB) elements to use when building IPA images.
32
+#ipa_build_dib_elements:
33
+
34
+# Dictionary of default environment variables to provide to Diskimage Builder
35
+# (DIB) during IPA image build.
36
+#ipa_build_dib_env_default:
37
+
38
+# Dictionary of additional environment variables to provide to Diskimage
39
+# Builder (DIB) during IPA image build.
40
+#ipa_build_dib_env_extra:
41
+
42
+# Dictionary of environment variables to provide to Diskimage Builder (DIB)
43
+# during IPA image build.
44
+#ipa_build_dib_env:
45
+
46
+# List of git repositories containing Diskimage Builder (DIB) elements. See
47
+# stackhpc.os-images role for usage.
48
+#ipa_build_dib_git_elements:
49
+
23 50
 ###############################################################################
24 51
 # Ironic Python Agent (IPA) images configuration.
25 52
 
@@ -38,14 +65,37 @@
38 65
 ###############################################################################
39 66
 # Ironic Python Agent (IPA) deployment configuration.
40 67
 
41
-# List of extra kernel parameters to enable LLDP collection.
42
-#ipa_kernel_options_collect_lldp:
68
+# Whether to enable collection of LLDP TLVs.
69
+#ipa_collect_lldp:
70
+
71
+# List of default inspection collectors to run.
72
+# NOTE: extra-hardware is not currently included as it requires a ramdisk
73
+#       with the hardware python module installed.
74
+#ipa_collectors_default:
75
+
76
+# List of additional inspection collectors to run.
77
+#ipa_collectors_extra:
78
+
79
+# List of inspection collectors to run.
80
+#ipa_collectors:
81
+
82
+# List of default inspection benchmarks to run.
83
+#ipa_benchmarks_default:
84
+
85
+# List of extra inspection benchmarks to run.
86
+#ipa_benchmarks_extra:
87
+
88
+# List of inspection benchmarks to run.
89
+#ipa_benchmarks:
90
+
91
+# List of default kernel parameters for Ironic python agent.
92
+#ipa_kernel_options_default:
43 93
 
44
-# List of extra kernel parameters to enable all inspector collectors.
45
-#ipa_kernel_options_inspection_collectors_all:
94
+# List of additional kernel parameters for Ironic python agent.
95
+#ipa_kernel_options_extra:
46 96
 
47
-# List of extra kernel parameters to enable all inspector benchmarks.
48
-#ipa_kernel_options_inspection_benchmarks_all:
97
+# List of kernel parameters for Ironic python agent.
98
+#ipa_kernel_options:
49 99
 
50 100
 ###############################################################################
51 101
 # Dummy variable to allow Ansible to accept this file.

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

@@ -63,6 +63,38 @@
63 63
 # remove. The value should be a list.
64 64
 #kolla_build_customizations:
65 65
 
66
+###############################################################################
67
+# Kolla-ansible inventory configuration.
68
+
69
+# Full custom seed inventory contents.
70
+#kolla_seed_inventory_custom:
71
+
72
+# Custom overcloud inventory containing a mapping from top level groups to
73
+# hosts.
74
+#kolla_overcloud_inventory_custom_top_level:
75
+
76
+# Custom overcloud inventory containing a mapping from components to top level
77
+# groups.
78
+#kolla_overcloud_inventory_custom_components:
79
+
80
+# Custom overcloud inventory containing a mapping from services to components.
81
+#kolla_overcloud_inventory_custom_services:
82
+
83
+# Full custom overcloud inventory contents. By default this will be the
84
+# concatenation of the top level, component, and service inventories.
85
+#kolla_overcloud_inventory_custom:
86
+
87
+# Dict mapping from kolla-ansible groups to kayobe groups and variables. Each
88
+# item is a dict with the following items:
89
+# * groups: A list of kayobe ansible groups to map to this kolla-ansible group.
90
+# * vars: A dict mapping variable names to values for hosts in this
91
+#         kolla-ansible group.
92
+#kolla_overcloud_inventory_top_level_group_map:
93
+
94
+# List of names of top level kolla-ansible groups. Any of these groups which
95
+# have no hosts mapped to them will be provided with an empty group definition.
96
+#kolla_overcloud_inventory_kolla_top_level_groups:
97
+
66 98
 ###############################################################################
67 99
 # Kolla-ansible configuration.
68 100
 

+ 16
- 0
etc/kayobe/monitoring.yml View File

@@ -9,6 +9,9 @@
9 9
 ###############################################################################
10 10
 # Monitoring node network interface configuration.
11 11
 
12
+# List of networks to which monitoring nodes are attached.
13
+#monitoring_network_interfaces:
14
+
12 15
 # List of default networks to which monitoring nodes are attached.
13 16
 #monitoring_default_network_interfaces:
14 17
 
@@ -60,6 +63,19 @@
60 63
 # role for format.
61 64
 #monitoring_lvm_groups_extra:
62 65
 
66
+###############################################################################
67
+# Monitoring node sysctl configuration.
68
+
69
+# Dict of sysctl parameters to set.
70
+#monitoring_sysctl_parameters:
71
+
72
+###############################################################################
73
+# Monitoring node user configuration.
74
+
75
+# List of users to create. This should be in a format accepted by the
76
+# singleplatform-eng.users role.
77
+#monitoring_users:
78
+
63 79
 ###############################################################################
64 80
 # Dummy variable to allow Ansible to accept this file.
65 81
 workaround_ansible_issue_8743: yes

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

@@ -27,6 +27,9 @@
27 27
 # to provide external network access via Neutron.
28 28
 #external_net_name:
29 29
 
30
+# Name of the network used to expose the public OpenStack API endpoints.
31
+#public_net_name:
32
+
30 33
 # Name of the network used to carry storage data traffic.
31 34
 #storage_net_name:
32 35
 

+ 16
- 0
etc/kayobe/seed-hypervisor.yml View File

@@ -2,6 +2,9 @@
2 2
 ###############################################################################
3 3
 # Seed hypervisor network interface configuration.
4 4
 
5
+# List of networks to which seed hypervisor nodes are attached.
6
+#seed_hypervisor_network_interfaces:
7
+
5 8
 # List of default networks to which seed hypervisor nodes are attached.
6 9
 #seed_hypervisor_default_network_interfaces:
7 10
 
@@ -41,6 +44,19 @@
41 44
 # List of libvirt networks for the seed hypervisor.
42 45
 #seed_hypervisor_libvirt_networks:
43 46
 
47
+###############################################################################
48
+# Seed hypervisor sysctl configuration.
49
+
50
+# Dict of sysctl parameters to set.
51
+#seed_hypervisor_sysctl_parameters:
52
+
53
+###############################################################################
54
+# Seed hypervisor user configuration.
55
+
56
+# List of users to create. This should be in a format accepted by the
57
+# singleplatform-eng.users role.
58
+#seed_hypervisor_users:
59
+
44 60
 ###############################################################################
45 61
 # Dummy variable to allow Ansible to accept this file.
46 62
 workaround_ansible_issue_8743: yes

+ 16
- 0
etc/kayobe/seed.yml View File

@@ -9,6 +9,9 @@
9 9
 ###############################################################################
10 10
 # Network interface attachments.
11 11
 
12
+# List of networks to which seed nodes are attached.
13
+#seed_network_interfaces:
14
+
12 15
 # List of default networks to which seed nodes are attached.
13 16
 #seed_default_network_interfaces:
14 17
 
@@ -48,6 +51,19 @@
48 51
 # Filesystem for docker volumes LVM backing volume. ext4 allows for shrinking.
49 52
 #seed_lvm_group_data_lv_docker_volumes_fs:
50 53
 
54
+###############################################################################
55
+# Seed node sysctl configuration.
56
+
57
+# Dict of sysctl parameters to set.
58
+#seed_sysctl_parameters:
59
+
60
+###############################################################################
61
+# Seed node user configuration.
62
+
63
+# List of users to create. This should be in a format accepted by the
64
+# singleplatform-eng.users role.
65
+#seed_users:
66
+
51 67
 ###############################################################################
52 68
 # Dummy variable to allow Ansible to accept this file.
53 69
 workaround_ansible_issue_8743: yes

+ 7
- 0
etc/kayobe/users.yml View File

@@ -0,0 +1,7 @@
1
+---
2
+################################################################################
3
+# User configuration.
4
+
5
+# List of users to create. This should be in a format accepted by the
6
+# singleplatform-eng.users role.
7
+#users_default:

Loading…
Cancel
Save