Synchronise with kayobe @ 1c976bc125784fa41503ebf2cd7aea5fe4a17170

This commit is contained in:
Mark Goddard 2018-05-02 15:02:22 +01:00
parent fb4024e152
commit 256ef9619d
3 changed files with 25 additions and 3 deletions

View File

@ -28,6 +28,9 @@
# CA of docker registry # CA of docker registry
#docker_registry_ca: #docker_registry_ca:
# Enable live-restore on docker daemon
#docker_daemon_live_restore:
############################################################################### ###############################################################################
# Dummy variable to allow Ansible to accept this file. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

View File

@ -138,9 +138,6 @@
# Whether TLS is enabled for the external API endpoints. # Whether TLS is enabled for the external API endpoints.
#kolla_enable_tls_external: #kolla_enable_tls_external:
# Path to external API certificate.
#kolla_external_fqdn_cert:
# Whether debug logging is enabled. # Whether debug logging is enabled.
#kolla_openstack_logging_debug: #kolla_openstack_logging_debug:
@ -222,6 +219,17 @@
# passwords file. # passwords file.
#kolla_ansible_custom_passwords: #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. # Dummy variable to allow Ansible to accept this file.
workaround_ansible_issue_8743: yes workaround_ansible_issue_8743: yes

View File

@ -10,6 +10,17 @@
#yum_epel_mirror_host: 'download.fedoraproject.org' #yum_epel_mirror_host: 'download.fedoraproject.org'
# Mirror directory for Yum EPEL repos. # Mirror directory for Yum EPEL repos.
#yum_epel_mirror_directory: 'pub/epel' #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. # Dummy variable to allow Ansible to accept this file.