Browse Source

Synchronise configuration with Kayobe for Queens

Sync was performed with Kayobe @
ebf93b8dc1.

Change-Id: Ia269dc9e446594549ec652e2a952d3eb3b0dc07a
Mark Goddard 6 months ago
parent
commit
371937fa90

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

@@ -69,6 +69,27 @@
69 69
 # Ironic inspector deployment ramdisk location.
70 70
 #kolla_bifrost_inspector_deploy_ramdisk:
71 71
 
72
+###############################################################################
73
+# Ironic Python Agent (IPA) configuration.
74
+
75
+# URL of Ironic Python Agent (IPA) kernel image.
76
+#kolla_bifrost_ipa_kernel_upstream_url:
77
+
78
+# URL of checksum of Ironic Python Agent (IPA) kernel image.
79
+#kolla_bifrost_ipa_kernel_checksum_url:
80
+
81
+# Algorithm of checksum of Ironic Python Agent (IPA) kernel image.
82
+#kolla_bifrost_ipa_kernel_checksum_algorithm:
83
+
84
+# URL of Ironic Python Agent (IPA) ramdisk image.
85
+#kolla_bifrost_ipa_ramdisk_upstream_url:
86
+
87
+# URL of checksum of Ironic Python Agent (IPA) ramdisk image.
88
+#kolla_bifrost_ipa_ramdisk_checksum_url:
89
+
90
+# Algorithm of checksum of Ironic Python Agent (IPA) ramdisk image.
91
+#kolla_bifrost_ipa_ramdisk_checksum_algorithm:
92
+
72 93
 ###############################################################################
73 94
 # Inventory configuration.
74 95
 

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

@@ -2,6 +2,9 @@
2 2
 ###############################################################################
3 3
 # DNS.
4 4
 
5
+# Whether kayobe should configure resolv.conf.
6
+#resolv_is_managed:
7
+
5 8
 # List of DNS nameservers.
6 9
 #resolv_nameservers:
7 10
 

+ 2
- 2
etc/kayobe/globals.yml View File

@@ -2,9 +2,9 @@
2 2
 # Kayobe global configuration.
3 3
 
4 4
 ###############################################################################
5
-# Local path configuration (ansible control host).
5
+# Local path configuration (Ansible control host).
6 6
 
7
-# Path to Kayobe configuration directory on ansible control host.
7
+# Path to Kayobe configuration directory on Ansible control host.
8 8
 #kayobe_config_path:
9 9
 
10 10
 ###############################################################################

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

@@ -8,9 +8,21 @@
8 8
 # URL of Ironic Python Agent (IPA) kernel image.
9 9
 #inspector_ipa_kernel_upstream_url:
10 10
 
11
+# URL of checksum of Ironic Python Agent (IPA) kernel image.
12
+#inspector_ipa_kernel_checksum_url:
13
+
14
+# Algorithm of checksum of Ironic Python Agent (IPA) kernel image.
15
+#inspector_ipa_kernel_checksum_algorithm:
16
+
11 17
 # URL of Ironic Python Agent (IPA) ramdisk image.
12 18
 #inspector_ipa_ramdisk_upstream_url:
13 19
 
20
+# URL of checksum of Ironic Python Agent (IPA) ramdisk image.
21
+#inspector_ipa_ramdisk_checksum_url:
22
+
23
+# Algorithm of checksum of Ironic Python Agent (IPA) ramdisk image.
24
+#inspector_ipa_ramdisk_checksum_algorithm:
25
+
14 26
 ###############################################################################
15 27
 # Ironic inspector processing configuration.
16 28
 

+ 27
- 0
etc/kayobe/inventory/group_vars/compute/network-interfaces View File

@@ -0,0 +1,27 @@
1
+---
2
+###############################################################################
3
+# Network interface definitions for the compute group.
4
+
5
+# Overcloud provisioning network IP information.
6
+# provision_oc_net_interface:
7
+# provision_oc_net_bridge_ports:
8
+# provision_oc_net_bond_slaves:
9
+
10
+# Internal network IP information.
11
+# internal_net_interface:
12
+# internal_net_bridge_ports:
13
+# internal_net_bond_slaves:
14
+
15
+# External network IP information.
16
+# external_net_interface:
17
+# external_net_bridge_ports:
18
+# external_net_bond_slaves:
19
+
20
+# Storage network IP information.
21
+# storage_net_interface:
22
+# storage_net_bridge_ports:
23
+# storage_net_bond_slaves:
24
+
25
+###############################################################################
26
+# Dummy variable to allow Ansible to accept this file.
27
+workaround_ansible_issue_8743: yes

+ 3
- 0
etc/kayobe/inventory/group_vars/overcloud/ansible-python-interpreter View File

@@ -0,0 +1,3 @@
1
+---
2
+# Use a virtual environment for remote operations.
3
+ansible_python_interpreter: "{{ virtualenv_path }}/kayobe/bin/python"

+ 3
- 0
etc/kayobe/inventory/group_vars/seed-hypervisor/ansible-python-interpreter View File

@@ -0,0 +1,3 @@
1
+---
2
+# Use a virtual environment for remote operations.
3
+ansible_python_interpreter: "{{ virtualenv_path }}/kayobe/bin/python"

+ 3
- 0
etc/kayobe/inventory/group_vars/seed/ansible-python-interpreter View File

@@ -0,0 +1,3 @@
1
+---
2
+# Use a virtual environment for remote operations.
3
+ansible_python_interpreter: "{{ virtualenv_path }}/kayobe/bin/python"

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

@@ -28,6 +28,9 @@ controllers
28 28
 [monitoring]
29 29
 # Empty group to provide declaration of monitoring group.
30 30
 
31
+[storage]
32
+# Empty group to provide declaration of storage group.
33
+
31 34
 [compute]
32 35
 # Empty group to provide declaration of compute group.
33 36
 
@@ -35,6 +38,7 @@ controllers
35 38
 controllers
36 39
 network
37 40
 monitoring
41
+storage
38 42
 compute
39 43
 
40 44
 ###############################################################################
@@ -46,6 +50,7 @@ seed
46 50
 controllers
47 51
 network
48 52
 monitoring
53
+storage
49 54
 compute
50 55
 
51 56
 ###############################################################################

+ 1
- 1
etc/kayobe/inventory/hosts.example View File

@@ -1,7 +1,7 @@
1 1
 # Kayobe hosts inventory file. This file should be modified to define the hosts
2 2
 # and their top-level group membership.
3 3
 
4
-# This host acts as the configuration management control host. This must be
4
+# This host acts as the configuration management Ansible control host. This must be
5 5
 # localhost.
6 6
 localhost ansible_connection=local
7 7
 

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

@@ -56,12 +56,24 @@
56 56
 # URL of Ironic deployment kernel image to download.
57 57
 #ipa_kernel_upstream_url:
58 58
 
59
+# URL of checksum of Ironic deployment kernel image.
60
+#ipa_kernel_checksum_url:
61
+
62
+# Algorithm of checksum of Ironic deployment kernel image.
63
+#ipa_kernel_checksum_algorithm:
64
+
59 65
 # Name of Ironic deployment ramdisk image to register in Glance.
60 66
 #ipa_images_ramdisk_name:
61 67
 
62 68
 # URL of Ironic deployment ramdisk image to download.
63 69
 #ipa_ramdisk_upstream_url:
64 70
 
71
+# URL of checksum of Ironic deployment ramdisk image.
72
+#ipa_ramdisk_checksum_url:
73
+
74
+# Algorithm of checksum of Ironic deployment ramdisk image.
75
+#ipa_ramdisk_checksum_algorithm:
76
+
65 77
 ###############################################################################
66 78
 # Ironic Python Agent (IPA) deployment configuration.
67 79
 

+ 34
- 4
etc/kayobe/kolla.yml View File

@@ -42,6 +42,9 @@
42 42
 # Path to virtualenv in which to install kolla-ansible.
43 43
 #kolla_ansible_venv:
44 44
 
45
+# Extra requirements to install inside the kolla-ansible virtualenv.
46
+#kolla_ansible_venv_extra_requirements:
47
+
45 48
 # Path to Kolla-ansible configuration directory.
46 49
 #kolla_config_path:
47 50
 
@@ -141,15 +144,31 @@
141 144
 # Whether debug logging is enabled.
142 145
 #kolla_openstack_logging_debug:
143 146
 
147
+# Upper constraints file for installation of Kolla.
148
+#kolla_upper_constraints_file:
149
+
150
+# User account to use for Kolla SSH access.
151
+#kolla_ansible_user:
152
+
153
+# Primary group of Kolla SSH user.
154
+#kolla_ansible_group:
155
+
156
+# Whether to use privilege escalation for all operations performed via Kolla
157
+# Ansible.
158
+#kolla_ansible_become:
159
+
144 160
 ###############################################################################
145 161
 # Kolla feature flag configuration.
146 162
 
147 163
 #kolla_enable_aodh:
148 164
 #kolla_enable_barbican:
165
+#kolla_enable_blazar:
149 166
 #kolla_enable_cadf_notifications:
150 167
 #kolla_enable_ceilometer:
151 168
 #kolla_enable_central_logging:
152 169
 #kolla_enable_ceph:
170
+#kolla_enable_ceph_mds:
171
+#kolla_enable_ceph_nfs:
153 172
 #kolla_enable_ceph_rgw:
154 173
 #kolla_enable_cinder:
155 174
 #kolla_enable_cinder_backend_hnas_iscsi:
@@ -157,10 +176,12 @@
157 176
 #kolla_enable_cinder_backend_iscsi:
158 177
 #kolla_enable_cinder_backend_lvm:
159 178
 #kolla_enable_cinder_backend_nfs:
179
+#kolla_enable_cinder_backend_zfssa_iscsi:
160 180
 #kolla_enable_cloudkitty:
161 181
 #kolla_enable_congress:
162 182
 #kolla_enable_designate:
163 183
 #kolla_enable_etcd:
184
+#kolla_enable_fluentd:
164 185
 #kolla_enable_freezer:
165 186
 #kolla_enable_gnocchi:
166 187
 #kolla_enable_grafana:
@@ -169,6 +190,8 @@
169 190
 #kolla_enable_horizon:
170 191
 #kolla_enable_influxdb:
171 192
 #kolla_enable_ironic:
193
+#kolla_enable_ironic_ipxe:
194
+#kolla_enable_ironic_pxe_uefi:
172 195
 #kolla_enable_iscsid:
173 196
 #kolla_enable_karbor:
174 197
 #kolla_enable_kuryr:
@@ -176,34 +199,41 @@
176 199
 #kolla_enable_manila:
177 200
 #kolla_enable_manila_backend_generic:
178 201
 #kolla_enable_manila_backend_hnas:
202
+#kolla_enable_manila_backend_cephfs_native:
203
+#kolla_enable_manila_backend_cephfs_nfs:
179 204
 #kolla_enable_mistral:
180 205
 #kolla_enable_monasca:
181 206
 #kolla_enable_mongodb:
182 207
 #kolla_enable_multipathd:
183 208
 #kolla_enable_murano:
184
-#kolla_enable_neutron_vpnaas:
209
+#kolla_enable_neutron_agent_ha:
210
+#kolla_enable_neutron_bgp_dragent:
185 211
 #kolla_enable_neutron_dvr:
186 212
 #kolla_enable_neutron_fwaas:
187 213
 #kolla_enable_neutron_lbaas:
188
-#kolla_enable_neutron_qos:
189
-#kolla_enable_neutron_agent_ha:
190
-#kolla_enable_neutron_bgp_dragent:
191 214
 #kolla_enable_neutron_provider_networks:
215
+#kolla_enable_neutron_qos:
216
+#kolla_enable_neutron_segments:
217
+#kolla_enable_neutron_sriov:
218
+#kolla_enable_neutron_vpnaas:
192 219
 #kolla_enable_nova_serialconsole_proxy:
193 220
 #kolla_enable_octavia:
194 221
 #kolla_enable_osprofiler:
195 222
 #kolla_enable_panko:
223
+#kolla_enable_qdrouterd:
196 224
 #kolla_enable_rally:
197 225
 #kolla_enable_sahara:
198 226
 #kolla_enable_searchlight:
199 227
 #kolla_enable_senlin:
200 228
 #kolla_enable_skydive:
201 229
 #kolla_enable_solum:
230
+#kolla_enable_storm:
202 231
 #kolla_enable_swift:
203 232
 #kolla_enable_tacker:
204 233
 #kolla_enable_telegraf:
205 234
 #kolla_enable_tempest:
206 235
 #kolla_enable_trove:
236
+#kolla_enable_vitrage:
207 237
 #kolla_enable_vmtp:
208 238
 #kolla_enable_watcher:
209 239
 #kolla_enable_zun:

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

@@ -4,6 +4,9 @@
4 4
 ###############################################################################
5 5
 # Network role to network mappings.
6 6
 
7
+# Name of the network used for admin access to the overcloud
8
+#admin_oc_net_name:
9
+
7 10
 # Name of the network used by the seed to manage the bare metal overcloud
8 11
 # hosts via their out-of-band management controllers.
9 12
 #oob_oc_net_name:
@@ -33,6 +36,9 @@
33 36
 # Name of the network used to expose the public OpenStack API endpoints.
34 37
 #public_net_name:
35 38
 
39
+# Name of the network used by Neutron to carry tenant overlay network traffic.
40
+#tunnel_net_name:
41
+
36 42
 # Name of the network used to carry storage data traffic.
37 43
 #storage_net_name:
38 44
 
@@ -43,9 +49,22 @@
43 49
 # workload hosts.
44 50
 #inspection_net_name:
45 51
 
52
+# Name of the network used to perform cleaning on the bare metal workload
53
+# hosts
54
+#cleaning_net_name:
55
+
46 56
 ###############################################################################
47 57
 # Network definitions.
48 58
 
59
+# Admin network IP information.
60
+# admin_oc_net_cidr:
61
+# admin_oc_net_allocation_pool_start:
62
+# admin_oc_net_allocation_pool_end:
63
+# admin_oc_net_gateway:
64
+# admin_oc_net_vlan:
65
+# admin_oc_net_mtu:
66
+# admin_oc_net_routes:
67
+
49 68
 # Overcloud out-of-band management network IP information.
50 69
 # oob_oc_net_cidr:
51 70
 # oob_oc_net_allocation_pool_start:
@@ -136,6 +155,17 @@
136 155
 # storage_mgmt_net_mtu:
137 156
 # storage_mgmt_net_routes:
138 157
 
158
+# Cleaning network IP information.
159
+# cleaning_net_cidr:
160
+# cleaning_net_allocation_pool_start:
161
+# cleaning_net_allocation_pool_end:
162
+# cleaning_net_neutron_allocation_pool_start:
163
+# cleaning_net_neutron_allocation_pool_end:
164
+# cleaning_net_gateway:
165
+# cleaning_net_vlan:
166
+# cleaning_net_mtu:
167
+# cleaning_net_routes:
168
+
139 169
 ###############################################################################
140 170
 # Network virtual patch link configuration.
141 171
 

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

@@ -28,6 +28,14 @@
28 28
 # https://bugs.centos.org/view.php?id=14369.
29 29
 #overcloud_host_image_workaround_resolv_enabled:
30 30
 
31
+# Workaround a CentOS 7.5 bug: cloud-init 0.7.9-24 does not correctly set
32
+# an IP address for VLAN subinterfaces configured with the Openstack metadata
33
+# format/Config drive. # See, https://bugs.centos.org/view.php?id=14964.
34
+#overcloud_host_image_workaround_cloud_init_enabled:
35
+
36
+# cloud-init repository for overcloud_host_image_workaround_cloud_init_enabled
37
+#overcloud_host_image_workaround_cloud_init_repo:
38
+
31 39
 ###############################################################################
32 40
 # Dummy variable to allow Ansible to accept this file.
33 41
 workaround_ansible_issue_8743: yes

+ 23
- 0
etc/kayobe/pip.yml View File

@@ -0,0 +1,23 @@
1
+---
2
+
3
+# Use a local PyPi mirror for installing Pip packages
4
+#pip_local_mirror: false
5
+
6
+# Users for which the necessary configuration will be put in place in order to
7
+# install PyPI packages from a mirror
8
+# NB: The Kolla user will be automatically added to this list if the above is
9
+# set to true
10
+#pip_applicable_users:
11
+#  - "{{ kayobe_ansible_user }}"
12
+#  - root
13
+
14
+# PyPI local package mirror URL
15
+#pip_index_url: ""
16
+
17
+# Optional: a list of 'trusted' hosts for which SSL verification will be
18
+# disabled
19
+#pip_trusted_hosts: []
20
+
21
+###############################################################################
22
+# Dummy variable to allow Ansible to accept this file.
23
+workaround_ansible_issue_8743: yes

+ 2
- 2
etc/kayobe/ssh.yml View File

@@ -5,10 +5,10 @@
5 5
 # Name of SSH key.
6 6
 #ssh_key_name:
7 7
 
8
-# Path to SSH private key on the control host.
8
+# Path to SSH private key on the Ansible control host.
9 9
 #ssh_private_key_path:
10 10
 
11
-# Path to SSH public key on the control host.
11
+# Path to SSH public key on the Ansible control host.
12 12
 #ssh_public_key_path:
13 13
 
14 14
 ###############################################################################

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

@@ -2,8 +2,10 @@
2 2
 
3 3
 # Whether or not to use a local Yum mirror.
4 4
 #yum_use_local_mirror: false
5
+
5 6
 # Mirror FQDN for Yum repos.
6 7
 #yum_centos_mirror_host: 'mirror.centos.org'
8
+
7 9
 # Mirror directory for Yum CentOS repos.
8 10
 #yum_centos_mirror_directory: 'centos'
9 11
 # Mirror FQDN for Yum EPEL repos.
@@ -22,6 +24,10 @@
22 24
 #     gpgcheck: yes
23 25
 #yum_custom_repos:
24 26
 
27
+# Whether to install the epel-release package. This affects RedHat-based
28
+# systems only.
29
+#yum_install_epel:
30
+
25 31
 ###############################################################################
26 32
 # Dummy variable to allow Ansible to accept this file.
27 33
 workaround_ansible_issue_8743: yes

Loading…
Cancel
Save