Browse Source

Synchronise with kayobe @ 1c976bc125

Mark Goddard 11 months ago
parent
commit
256ef9619d
3 changed files with 25 additions and 3 deletions
  1. 3
    0
      etc/kayobe/docker.yml
  2. 11
    3
      etc/kayobe/kolla.yml
  3. 11
    0
      etc/kayobe/yum.yml

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

@@ -28,6 +28,9 @@
28 28
 # CA of docker registry
29 29
 #docker_registry_ca:
30 30
 
31
+# Enable live-restore on docker daemon
32
+#docker_daemon_live_restore:
33
+
31 34
 ###############################################################################
32 35
 # Dummy variable to allow Ansible to accept this file.
33 36
 workaround_ansible_issue_8743: yes

+ 11
- 3
etc/kayobe/kolla.yml View File

@@ -138,9 +138,6 @@
138 138
 # Whether TLS is enabled for the external API endpoints.
139 139
 #kolla_enable_tls_external:
140 140
 
141
-# Path to external API certificate.
142
-#kolla_external_fqdn_cert:
143
-
144 141
 # Whether debug logging is enabled.
145 142
 #kolla_openstack_logging_debug:
146 143
 
@@ -222,6 +219,17 @@
222 219
 # passwords file.
223 220
 #kolla_ansible_custom_passwords:
224 221
 
222
+###############################################################################
223
+# TLS certificate bundle management
224
+
225
+# Optionally copy a TLS certificate bundle into place.
226
+#
227
+# When enabled, this will copy the contents of kolla_tls_cert into place for
228
+# use by HAproxy.
229
+#
230
+# Note that this should be formatted as a literal style block scalar.
231
+#kolla_tls_cert:
232
+
225 233
 ###############################################################################
226 234
 # Dummy variable to allow Ansible to accept this file.
227 235
 workaround_ansible_issue_8743: yes

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

@@ -10,6 +10,17 @@
10 10
 #yum_epel_mirror_host: 'download.fedoraproject.org'
11 11
 # Mirror directory for Yum EPEL repos.
12 12
 #yum_epel_mirror_directory: 'pub/epel'
13
+# A dict of custom repositories.
14
+# You can see params on
15
+# http://docs.ansible.com/ansible/latest/modules/yum_repository_module.html.
16
+# For example:
17
+# yum_custom_repos:
18
+#   reponame:
19
+#     baseurl: http://repo
20
+#     file: myrepo
21
+#     gpgkey: http://gpgkey
22
+#     gpgcheck: yes
23
+#yum_custom_repos:
13 24
 
14 25
 ###############################################################################
15 26
 # Dummy variable to allow Ansible to accept this file.

Loading…
Cancel
Save