From 256ef9619dd23e457f0b69886252cabba4c155a2 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 2 May 2018 15:02:22 +0100
Subject: [PATCH] Synchronise with kayobe @
 1c976bc125784fa41503ebf2cd7aea5fe4a17170

---
 etc/kayobe/docker.yml |  3 +++
 etc/kayobe/kolla.yml  | 14 +++++++++++---
 etc/kayobe/yum.yml    | 11 +++++++++++
 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 @@
 # CA of docker registry
 #docker_registry_ca:
 
+# Enable live-restore on docker daemon
+#docker_daemon_live_restore:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_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 @@
 # Whether TLS is enabled for the external API endpoints.
 #kolla_enable_tls_external:
 
-# Path to external API certificate.
-#kolla_external_fqdn_cert:
-
 # Whether debug logging is enabled.
 #kolla_openstack_logging_debug:
 
@@ -222,6 +219,17 @@
 # passwords file.
 #kolla_ansible_custom_passwords:
 
+###############################################################################
+# TLS certificate bundle management
+
+# Optionally copy a TLS certificate bundle into place.
+#
+# When enabled, this will copy the contents of kolla_tls_cert into place for
+# use by HAproxy.
+#
+# Note that this should be formatted as a literal style block scalar.
+#kolla_tls_cert:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_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 @@
 #yum_epel_mirror_host: 'download.fedoraproject.org'
 # Mirror directory for Yum EPEL repos.
 #yum_epel_mirror_directory: 'pub/epel'
+# A dict of custom repositories.
+# You can see params on
+# http://docs.ansible.com/ansible/latest/modules/yum_repository_module.html.
+# For example:
+# yum_custom_repos:
+#   reponame:
+#     baseurl: http://repo
+#     file: myrepo
+#     gpgkey: http://gpgkey
+#     gpgcheck: yes
+#yum_custom_repos:
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.