summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2018-05-02 15:02:22 +0100
committerMark Goddard <mark@stackhpc.com>2018-05-02 15:02:22 +0100
commit256ef9619dd23e457f0b69886252cabba4c155a2 (patch)
tree735ced24b17ff4ba0ac29eeb8664e683fc588608
parentfb4024e152abe1d08bb5d50f773b89e58117e0f2 (diff)
-rw-r--r--etc/kayobe/docker.yml3
-rw-r--r--etc/kayobe/kolla.yml14
-rw-r--r--etc/kayobe/yum.yml11
3 files changed, 25 insertions, 3 deletions
diff --git a/etc/kayobe/docker.yml b/etc/kayobe/docker.yml
index 6f92d01..6ee82d5 100644
--- a/etc/kayobe/docker.yml
+++ b/etc/kayobe/docker.yml
@@ -28,6 +28,9 @@
28# CA of docker registry 28# CA of docker registry
29#docker_registry_ca: 29#docker_registry_ca:
30 30
31# Enable live-restore on docker daemon
32#docker_daemon_live_restore:
33
31############################################################################### 34###############################################################################
32# Dummy variable to allow Ansible to accept this file. 35# Dummy variable to allow Ansible to accept this file.
33workaround_ansible_issue_8743: yes 36workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 1af896d..568e71c 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -138,9 +138,6 @@
138# Whether TLS is enabled for the external API endpoints. 138# Whether TLS is enabled for the external API endpoints.
139#kolla_enable_tls_external: 139#kolla_enable_tls_external:
140 140
141# Path to external API certificate.
142#kolla_external_fqdn_cert:
143
144# Whether debug logging is enabled. 141# Whether debug logging is enabled.
145#kolla_openstack_logging_debug: 142#kolla_openstack_logging_debug:
146 143
@@ -223,5 +220,16 @@
223#kolla_ansible_custom_passwords: 220#kolla_ansible_custom_passwords:
224 221
225############################################################################### 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
233###############################################################################
226# Dummy variable to allow Ansible to accept this file. 234# Dummy variable to allow Ansible to accept this file.
227workaround_ansible_issue_8743: yes 235workaround_ansible_issue_8743: yes
diff --git a/etc/kayobe/yum.yml b/etc/kayobe/yum.yml
index 5d0af6d..66832d3 100644
--- a/etc/kayobe/yum.yml
+++ b/etc/kayobe/yum.yml
@@ -10,6 +10,17 @@
10#yum_epel_mirror_host: 'download.fedoraproject.org' 10#yum_epel_mirror_host: 'download.fedoraproject.org'
11# Mirror directory for Yum EPEL repos. 11# Mirror directory for Yum EPEL repos.
12#yum_epel_mirror_directory: 'pub/epel' 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# Dummy variable to allow Ansible to accept this file. 26# Dummy variable to allow Ansible to accept this file.