Browse Source

Synchronise configuration with kayobe 1.0.0

Mark Goddard 1 year ago
parent
commit
e7ea2d5e4c

+ 13
- 0
etc/kayobe/docker-registry.yml View File

@@ -0,0 +1,13 @@
1
+---
2
+###############################################################################
3
+# Docker registry configuration.
4
+
5
+# Whether a docker registry is enabled.
6
+#docker_registry_enabled:
7
+
8
+# The port on which the docker registry server should listen.
9
+#docker_registry_port:
10
+
11
+###############################################################################
12
+# Dummy variable to allow Ansible to accept this file.
13
+workaround_ansible_issue_8743: yes

+ 7
- 3
etc/kayobe/inspector.yml View File

@@ -45,9 +45,13 @@
45 45
 # Ironic inspector IPMI password to set.
46 46
 #inspector_ipmi_password:
47 47
 
48
-# Ironic inspector network interface name on which to check for an LLDP switch
49
-# port description to use as the node's name.
50
-#inspector_lldp_switch_port_interface:
48
+# Ironic inspector default network interface name on which to check for an LLDP
49
+# switch port description to use as the node's name.
50
+#inspector_lldp_switch_port_interface_default:
51
+
52
+# Ironic inspector map from hostname to network interface name on which to
53
+# check for an LLDP switch port description to use as the node's name.
54
+#inspector_lldp_switch_port_interface_map:
51 55
 
52 56
 ###############################################################################
53 57
 # Ironic inspector introspection rules configuration.

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

@@ -7,10 +7,18 @@
7 7
 [controllers]
8 8
 # Empty group to provide declaration of controllers group.
9 9
 
10
+[monitoring]
11
+# Empty group to provide declaration of monitoring group.
12
+
13
+[overcloud:children]
14
+controllers
15
+monitoring
16
+
10 17
 [docker:children]
11 18
 # Hosts in this group will have Docker installed.
12 19
 seed
13 20
 controllers
21
+monitoring
14 22
 
15 23
 ###############################################################################
16 24
 # Networking groups.

+ 21
- 2
etc/kayobe/ipa.yml View File

@@ -1,6 +1,25 @@
1 1
 ---
2 2
 # Ironic Python Agent (IPA) configuration.
3 3
 
4
+###############################################################################
5
+# Ironic Python Agent (IPA) image build configuration.
6
+
7
+# Whether to build IPA images from source.
8
+#ipa_build_images:
9
+
10
+# URL of IPA source repository.
11
+#ipa_build_source_url:
12
+
13
+# Version of IPA source repository.
14
+#ipa_build_source_version:
15
+
16
+# URL of IPA upper constraints file.
17
+#ipa_build_upper_constraints_file_url:
18
+
19
+# Custom python package version constraints for IPA. Dict mapping package name
20
+# to upper version constraint.
21
+#ipa_build_custom_upper_constraints:
22
+
4 23
 ###############################################################################
5 24
 # Ironic Python Agent (IPA) images configuration.
6 25
 
@@ -8,13 +27,13 @@
8 27
 #ipa_images_kernel_name:
9 28
 
10 29
 # URL of Ironic deployment kernel image to download.
11
-#ipa_images_kernel_url:
30
+#ipa_kernel_upstream_url:
12 31
 
13 32
 # Name of Ironic deployment ramdisk image to register in Glance.
14 33
 #ipa_images_ramdisk_name:
15 34
 
16 35
 # URL of Ironic deployment ramdisk image to download.
17
-#ipa_images_ramdisk_url:
36
+#ipa_ramdisk_upstream_url:
18 37
 
19 38
 ###############################################################################
20 39
 # Ironic Python Agent (IPA) deployment configuration.

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

@@ -55,6 +55,14 @@
55 55
 # Dict mapping Jinja2 block names in kolla's Docker images to their contents.
56 56
 #kolla_build_blocks:
57 57
 
58
+# Dict mapping image customization variable names to their values.
59
+# Each variable takes the form:
60
+# <image name>_<customization>_<operation>
61
+# Hyphens in the image name are replaced with underscores. The customization is
62
+# most commonly packages. The operation should be one of override, append or
63
+# remove. The value should be a list.
64
+#kolla_build_customizations:
65
+
58 66
 ###############################################################################
59 67
 # Kolla-ansible configuration.
60 68
 

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

@@ -0,0 +1,65 @@
1
+---
2
+###############################################################################
3
+# Monitoring node configuration.
4
+
5
+# User with which to access the monitoring nodes via SSH during bootstrap, in
6
+# order to setup the Kayobe user account.
7
+#monitoring_bootstrap_user:
8
+
9
+###############################################################################
10
+# Monitoring node network interface configuration.
11
+
12
+# List of default networks to which monitoring nodes are attached.
13
+#monitoring_default_network_interfaces:
14
+
15
+# List of extra networks to which monitoring nodes are attached.
16
+#monitoring_extra_network_interfaces:
17
+
18
+###############################################################################
19
+# Monitoring node BIOS configuration.
20
+
21
+# Dict of monitoring node BIOS options. Format is same as that used by
22
+# stackhpc.drac role.
23
+#monitoring_bios_config: 
24
+
25
+# Dict of default monitoring node BIOS options. Format is same as that used by
26
+# stackhpc.drac role.
27
+#monitoring_bios_config_default:
28
+
29
+# Dict of additional monitoring node BIOS options. Format is same as that used
30
+# by stackhpc.drac role.
31
+#monitoring_bios_config_extra:
32
+
33
+###############################################################################
34
+# Monitoring node RAID configuration.
35
+
36
+# List of monitoring node RAID volumes. Format is same as that used by
37
+# stackhpc.drac role.
38
+#monitoring_raid_config:
39
+
40
+# List of default monitoring node RAID volumes. Format is same as that used by
41
+# stackhpc.drac role.
42
+#monitoring_raid_config_default:
43
+
44
+# List of additional monitoring node RAID volumes. Format is same as that used
45
+# by stackhpc.drac role.
46
+#monitoring_raid_config_extra:
47
+
48
+###############################################################################
49
+# Monitoring node LVM configuration.
50
+
51
+# List of monitoring node volume groups. See mrlesmithjr.manage-lvm role for
52
+# format.
53
+#monitoring_lvm_groups:
54
+
55
+# Default list of monitoring node volume groups. See mrlesmithjr.manage-lvm
56
+# role for format.
57
+#monitoring_lvm_groups_default:
58
+
59
+# Additional list of monitoring node volume groups. See mrlesmithjr.manage-lvm
60
+# role for format.
61
+#monitoring_lvm_groups_extra:
62
+
63
+###############################################################################
64
+# Dummy variable to allow Ansible to accept this file.
65
+workaround_ansible_issue_8743: yes

+ 5
- 2
etc/kayobe/neutron.yml View File

@@ -14,10 +14,13 @@
14 14
 # List of Neutron ML2 network VLAN ranges to use. Each item should be a dict
15 15
 # containing the following items:
16 16
 # physical_network: The physical network
17
-# min: Minimum of allowed VLAN range (optional)
18
-# max: Maximum of allowed VLAN range (optional)
17
+# range: Range of allowed VLANs on this physical network (format <min>:<max>,
18
+# optional)
19 19
 #kolla_neutron_ml2_network_vlan_ranges:
20 20
 
21
+# List of Neutron ML2 extention drivers to use.
22
+#kolla_neutron_ml2_extension_drivers:
23
+
21 24
 # List of switches to configure for use by genericswitch ML2 mechanism driver.
22 25
 # Each item should be a dict containing the following items:
23 26
 # name: Hostname of the switch

+ 10
- 0
etc/kayobe/opensm.yml View File

@@ -0,0 +1,10 @@
1
+---
2
+###############################################################################
3
+# OpenSM Infiniband subnet manager configuration.
4
+
5
+# Whether OpenSM is enabled.
6
+#opensm_enabled:
7
+
8
+###############################################################################
9
+# Dummy variable to allow Ansible to accept this file.
10
+workaround_ansible_issue_8743: yes

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

@@ -0,0 +1,14 @@
1
+---
2
+###############################################################################
3
+# Overcloud configuration.
4
+
5
+# Default Ansible group for overcloud hosts.
6
+#overcloud_group_default:
7
+
8
+# List of names of Ansible groups for overcloud hosts.
9
+#overcloud_groups:
10
+
11
+# Dict mapping overcloud Ansible group names to lists of hosts in the group.
12
+# As a special case, the group 'ignore' can be used to specify hosts that
13
+# should not be added to the inventory.
14
+#overcloud_group_hosts_map:

Loading…
Cancel
Save