Merge remote-tracking branch 'upstream/stable/2023.1' into stackhpc/2023.1

Author: Alex-Welsh

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config.git
-defaultbranch=stable/zed
+defaultbranch=stable/2023.1

etc/kayobe/globals.yml

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

etc/kayobe/kolla.yml

@@ -445,6 +445,19 @@ kolla_build_args:
 # remotely on the target nodes. If None, no virtualenv will be used.
 #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'.
 #kolla_enable_tls_external:
 

etc/kayobe/openstack.yml

@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "zed".
+# Name of the current OpenStack release. Default is "2023.1".
 #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:
 
 ###############################################################################

tox.ini

@@ -6,7 +6,7 @@ skipsdist = True
 [testenv]
 install_command = pip install {opts} {packages}
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/zed}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2023.1}
     -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]