From 306394500c8f276be97a68c7df79c0ebd46702fe Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Mon, 16 Dec 2019 18:57:38 +0100 Subject: [PATCH] Synchronise with kayobe-config for Train Synchronises the configuration with kayobe-config prior to creating a stable/train branch. This commit also defines the Ceph and Swift storage networks, which had been skipped in the Stein sync. Change-Id: I67521122e8a87b2e0637e8f671c3fbc0b8f0fbb5 --- etc/kayobe/bifrost.yml | 12 +++++++ etc/kayobe/docker.yml | 3 ++ etc/kayobe/ipa.yml | 10 ++---- etc/kayobe/kolla.yml | 76 ++++++++++++++++++++++++++++------------ etc/kayobe/networks.yml | 16 +++++++++ etc/kayobe/openstack.yml | 4 +-- etc/kayobe/pip.yml | 5 +++ 7 files changed, 95 insertions(+), 31 deletions(-) diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index 078a6ce..60254d2 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -20,12 +20,24 @@ # DIB image OS release. #kolla_bifrost_dib_os_release: +# List of default DIB elements. +#kolla_bifrost_dib_elements_default: + +# List of additional DIB elements. +#kolla_bifrost_dib_elements_extra: + # List of DIB elements. #kolla_bifrost_dib_elements: # DIB init element. #kolla_bifrost_dib_init_element: +# DIB default environment variables. +#kolla_bifrost_dib_env_vars_default: + +# DIB additional environment variables. +#kolla_bifrost_dib_env_vars_extra: + # DIB environment variables. #kolla_bifrost_dib_env_vars: diff --git a/etc/kayobe/docker.yml b/etc/kayobe/docker.yml index 1697d61..6e70a4b 100644 --- a/etc/kayobe/docker.yml +++ b/etc/kayobe/docker.yml @@ -27,6 +27,9 @@ docker_storage_driver: overlay # CA of docker registry #docker_registry_ca: +# List of Docker registry mirrors. +#docker_registry_mirrors: + # Enable live-restore on docker daemon #docker_daemon_live_restore: diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index 6416f5e..c0ad6c8 100644 --- a/etc/kayobe/ipa.yml +++ b/etc/kayobe/ipa.yml @@ -13,13 +13,6 @@ # Version of IPA source repository. Default is {{ openstack_branch }}. #ipa_build_source_version: -# URL of IPA upper constraints file. -#ipa_build_upper_constraints_file_url: - -# Custom python package version constraints for IPA. Dict mapping package name -# to upper version constraint. -#ipa_build_custom_upper_constraints: - # List of default Diskimage Builder (DIB) elements to use when building IPA # images. #ipa_build_dib_elements_default: @@ -47,6 +40,9 @@ # stackhpc.os-images role for usage. #ipa_build_dib_git_elements: +# List of DIB packages to install. Default is none. +#ipa_build_dib_packages: + ############################################################################### # Ironic Python Agent (IPA) images configuration. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 37438ad..7541dea 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -27,49 +27,59 @@ # Kolla-ansible installation. # Type of Kolla-ansible control installation. One of 'binary' or 'source'. +# Default is 'source'. #kolla_ansible_ctl_install_type: # Path to directory for kolla-ansible source code checkout. +# Default is $KOLLA_SOURCE_PATH, or $PWD/src/kolla-ansible if +# $KOLLA_SOURCE_PATH is not set. #kolla_ansible_source_path: -# URL of Kolla Ansible source code repository if type is 'source'. +# URL of Kolla Ansible source code repository if type is 'source'. Default is +# https://opendev.org/openstack/kolla-ansible. #kolla_ansible_source_url: # Version (branch, tag, etc.) of Kolla Ansible source code repository if type # is 'source'. Default is {{ openstack_branch }}. #kolla_ansible_source_version: -# Path to virtualenv in which to install kolla-ansible. +# Path to virtualenv in which to install kolla-ansible. Default is +# $KOLLA_VENV_PATH or $PWD/venvs/kolla-ansible if $KOLLA_VENV_PATH is not set. #kolla_ansible_venv: # Extra requirements to install inside the kolla-ansible virtualenv. #kolla_ansible_venv_extra_requirements: -# Path to Kolla-ansible configuration directory. +# Path to Kolla-ansible configuration directory. Default is $KOLLA_CONFIG_PATH +# or /etc/kolla if $KOLLA_CONFIG_PATH is not set. #kolla_config_path: -# Path to Kolla-ansible node custom configuration directory. +# Path to Kolla-ansible node custom configuration directory. Default is +# {{ kolla_config_path }}/config. #kolla_node_custom_config_path: ############################################################################### # Kolla configuration. -# Kolla base container image distribution. +# Kolla base container image distribution. Default is 'centos'. #kolla_base_distro: -# Kolla container image type: binary or source. +# Kolla container image type: binary or source. Default is 'binary'. #kolla_install_type: -# URL of docker registry to use for Kolla images. +# URL of docker registry to use for Kolla images. Default is not set, in which +# case Dockerhub will be used. #kolla_docker_registry: -# Docker namespace to use for Kolla images. +# Docker namespace to use for Kolla images. Default is 'kolla'. #kolla_docker_namespace: -# Username to use to access a docker registry. +# Username to use to access a docker registry. Default is not set, in which +# case the registry will be used without authentication. #kolla_docker_registry_username: -# Password to use to access a docker registry. +# Password to use to access a docker registry. Default is not set, in which +# case the registry will be used without authentication. #kolla_docker_registry_password: # Kolla OpenStack release version. This should be a Docker image tag. @@ -80,7 +90,7 @@ # kolla_install_type=source. See kolla.common.config for details. # Example: # kolla_sources: -# ironic_base: +# ironic-base: # type: git # location: https://github.com/openstack/ironic # reference: master @@ -139,23 +149,27 @@ # remotely on the target nodes. If None, no virtualenv will be used. #kolla_ansible_target_venv: -# Whether TLS is enabled for the external API endpoints. +# Whether TLS is enabled for the external API endpoints. Default is 'no'. #kolla_enable_tls_external: -# Whether debug logging is enabled. +# Whether TLS is enabled for the internal API endpoints. Default is 'no'. +#kolla_enable_tls_internal: + +# Whether debug logging is enabled. Default is 'false'. #kolla_openstack_logging_debug: # Upper constraints file for installation of Kolla. +# Default value is {{ pip_upper_constraints_file }}. #kolla_upper_constraints_file: -# User account to use for Kolla SSH access. +# User account to use for Kolla SSH access. Default is 'kolla'. #kolla_ansible_user: -# Primary group of Kolla SSH user. +# Primary group of Kolla SSH user. Default is 'kolla'. #kolla_ansible_group: # Whether to use privilege escalation for all operations performed via Kolla -# Ansible. +# Ansible. Default is 'true'. #kolla_ansible_become: ############################################################################### @@ -206,6 +220,7 @@ #kolla_enable_manila_backend_hnas: #kolla_enable_manila_backend_cephfs_native: #kolla_enable_manila_backend_cephfs_nfs: +#kolla_enable_mariabackup: #kolla_enable_mistral: #kolla_enable_monasca: #kolla_enable_mongodb: @@ -258,18 +273,35 @@ ############################################################################### # TLS certificate bundle management -# Optionally copy a TLS certificate bundle into place. +# External API certificate bundle. # -# When enabled, this will copy the contents of kolla_tls_cert into place for -# use by HAproxy. +# When kolla_enable_tls_external is true, this should contain an X.509 +# certificate bundle for the external API. # # Note that this should be formatted as a literal style block scalar. -#kolla_tls_cert: +# +# NOTE: kolla_tls_cert has been renamed to kolla_external_tls_cert. Support for +# the deprecated name kolla_tls_cert will be removed in a future release. +#kolla_external_tls_cert: -# Path to a CA certificate file to use for the OS_CACERT environment variable in -# openrc files when TLS is enabled, instead of Kolla-Ansible's default. +# Path to a CA certificate file to use for the OS_CACERT environment variable +# in public-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's +# default. #kolla_external_fqdn_cacert: +# Internal API certificate bundle. +# +# When kolla_enable_tls_internal is true, this should contain an X.509 +# certificate bundle for the internal API. +# +# Note that this should be formatted as a literal style block scalar. +#kolla_internal_tls_cert: + +# Path to a CA certificate file to use for the OS_CACERT environment variable +# in admin-openrc.sh file when TLS is enabled, instead of Kolla-Ansible's +# default. +#kolla_internal_fqdn_cacert: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml index aab560f..e422b98 100644 --- a/etc/kayobe/networks.yml +++ b/etc/kayobe/networks.yml @@ -59,6 +59,22 @@ storage_net_name: aio #storage_mgmt_net_name: storage_mgmt_net_name: aio +# Name of the network used to carry ceph storage data traffic. +#ceph_storage_net_name: +ceph_storage_net_name: aio + +# Name of the network used to carry ceph storage management traffic. +#ceph_storage_mgmt_net_name: +ceph_storage_mgmt_net_name: aio + +# Name of the network used to carry swift storage data traffic. +#swift_storage_net_name: +swift_storage_net_name: aio + +# Name of the network used to carry swift storage replication traffic. +#swift_storage_replication_net_name: +swift_storage_replication_net_name: aio + # Name of the network used to perform hardware introspection on the bare metal # workload hosts. #inspection_net_name: diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index f9ef447..b2ad4e9 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "stein". +# Name of the current OpenStack release. Default is "train". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/stein". +# Name of the current OpenStack branch. Default is "stable/train". #openstack_branch: ############################################################################### diff --git a/etc/kayobe/pip.yml b/etc/kayobe/pip.yml index 29a84f0..5b62fcf 100644 --- a/etc/kayobe/pip.yml +++ b/etc/kayobe/pip.yml @@ -1,5 +1,10 @@ --- +# Upper constraints file for installation of python packages. +# Default value is +# "https://releases.openstack.org/constraints/upper/{{ openstack_branch }}" +#pip_upper_constraints_file: + # Use a local PyPi mirror for installing Pip packages #pip_local_mirror: false