2023.1 RC1 - Sync defaults with Kayobe

Change-Id: Ic57af218e52d050cec06fa2246d078f5ed792fa8
This commit is contained in:
Matt Crees 2023-05-26 11:17:08 +01:00
parent 12cbf39eed
commit c558f2101b
3 changed files with 20 additions and 7 deletions

View File

@ -4,8 +4,7 @@
############################################################################### ###############################################################################
# Local path configuration (Ansible control host). # Local path configuration (Ansible control host).
# Path to Kayobe configuration directory on Ansible control host, with an # Path to Kayobe configuration directory on Ansible control host.
# environment path appended if kayobe_environment is set.
#kayobe_config_path: #kayobe_config_path:
# Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an # Name of Kayobe environment to use. Default is $KAYOBE_ENVIRONMENT, or an

View File

@ -79,7 +79,7 @@
#kolla_base_distro_version: #kolla_base_distro_version:
# URL of docker registry to use for Kolla images. Default is not set, in which # URL of docker registry to use for Kolla images. Default is not set, in which
# case Dockerhub will be used. # case Quay.io will be used.
#kolla_docker_registry: #kolla_docker_registry:
# Docker namespace to use for Kolla images. Default is 'kolla'. # Docker namespace to use for Kolla images. Default is 'kolla'.
@ -102,8 +102,9 @@
# Default is {{ openstack_release }}. # Default is {{ openstack_release }}.
#kolla_openstack_release: #kolla_openstack_release:
# Docker tag applied to built container images. Default is # Docker tag applied to built container images. Default is {{
# {{ kolla_openstack_release }}. # kolla_openstack_release }}-{{ kolla_base_distro }}-{{
# kolla_base_distro_version }}.
#kolla_tag: #kolla_tag:
# Dict mapping names of sources to their definitions. # Dict mapping names of sources to their definitions.
@ -235,6 +236,19 @@
# remotely on the target nodes. If None, no virtualenv will be used. # remotely on the target nodes. If None, no virtualenv will be used.
#kolla_ansible_target_venv: #kolla_ansible_target_venv:
# Password to use to encrypt the kolla-ansible passwords.yml file.
#kolla_ansible_vault_password:
# Hashi Vault
#kolla_ansible_vault_addr:
#kolla_ansible_vault_mount_point:
#kolla_ansible_vault_kv_path:
#kolla_ansible_vault_namespace:
#kolla_ansible_vault_role_id:
#kolla_ansible_vault_secret_id:
#kolla_ansible_vault_token:
#kolla_ansible_vault_cacert:
# Whether TLS is enabled for the external API endpoints. Default is 'no'. # Whether TLS is enabled for the external API endpoints. Default is 'no'.
#kolla_enable_tls_external: #kolla_enable_tls_external:

View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "zed". # Name of the current OpenStack release. Default is "2023.1".
#openstack_release: #openstack_release:
# Name of the current OpenStack branch. Default is "stable/zed". # Name of the current OpenStack branch. Default is "stable/2023.1".
#openstack_branch: #openstack_branch:
############################################################################### ###############################################################################