Synchronise with stable/ocata

This commit is contained in:
Mark Goddard 2017-09-20 17:22:48 +01:00
parent 88dfc10bca
commit b8fc530c91
2 changed files with 31 additions and 7 deletions

View File

@ -2,21 +2,24 @@
# Kayobe global configuration.
###############################################################################
# Path configuration.
# Local path configuration (ansible control host).
# Path to Kayobe configuration.
# Path to Kayobe configuration directory on ansible control host.
#kayobe_config_path:
# Path in which to store data locally.
###############################################################################
# Remote path configuration (seed, seed-hypervisor and overcloud hosts).
# Base path for kayobe state on remote hosts.
#base_path:
# Path in which to cache downloaded images.
# Path in which to cache downloaded images on remote hosts.
#image_cache_path:
# Path on which to checkout source code repositories.
# Path on which to checkout source code repositories on remote hosts.
#source_checkout_path:
# Path on which to create python virtualenvs.
# Path on which to create python virtualenvs on remote hosts.
#virtualenv_path:
###############################################################################

View File

@ -7,6 +7,9 @@
# Type of Kolla control installation. One of 'binary' or 'source'.
#kolla_ctl_install_type:
# Path to directory for kolla source code checkout.
#kolla_source_path:
# URL of Kolla source code repository if type is 'source'.
#kolla_source_url:
@ -14,6 +17,18 @@
# 'source'.
#kolla_source_version:
# Path to virtualenv in which to install kolla.
#kolla_venv:
###############################################################################
# Kolla-ansible installation.
# Type of Kolla-ansible control installation. One of 'binary' or 'source'.
#kolla_ansible_ctl_install_type:
# Path to directory for kolla-ansible source code checkout.
#kolla_ansible_source_path:
# URL of Kolla Ansible source code repository if type is 'source'.
#kolla_ansible_source_url:
@ -21,12 +36,18 @@
# is 'source'.
#kolla_ansible_source_version:
# Path to virtualenv in which to install kolla-ansible.
#kolla_ansible_venv:
###############################################################################
# Kolla configuration.
# Kolla & kolla-ansible configuration.
# Path to Kolla configuration directory.
#kolla_config_path:
# Path to Kolla node custom configuration directory.
#kolla_node_custom_config_path:
# Kolla base container image distribution.
#kolla_base_distro: