Use master upper constraints
Yoga upper constraints were used to keep compatibility with Python 3.6. This is not needed with all supported OS using Python 3.9 or newer. This reverts commitsd2e0d64eb0
andd190e9e3a3
. Change-Id: I35a07bcc2b7c9cbb49fa60e6802cc6288a34fbd8
This commit is contained in:
parent
4fa3165fad
commit
5b84ef3760
@ -1,3 +1,3 @@
|
||||
---
|
||||
# Upper constraints file for installation of python packages.
|
||||
pip_upper_constraints_file: "https://releases.openstack.org/constraints/upper/yoga"
|
||||
pip_upper_constraints_file: "https://releases.openstack.org/constraints/upper/{{ openstack_release }}"
|
||||
|
@ -72,8 +72,7 @@ function config_defaults {
|
||||
if [ -f "${PARENT}/../.gitreview" ]; then
|
||||
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' "${PARENT}/../.gitreview")
|
||||
if [[ "${BRANCH}" == "" ]]; then
|
||||
# TODO(priteau): Revert to master once we use Python 3.8+
|
||||
SERIES="yoga"
|
||||
SERIES="master"
|
||||
else
|
||||
SERIES="$(echo ${BRANCH} | sed 's|stable/||')"
|
||||
fi
|
||||
|
@ -54,5 +54,3 @@ libvirt_vm_emulator: "{% if ansible_facts.os_family == 'RedHat' %}/usr/libexec/q
|
||||
# Specify a log path in the kolla_logs Docker volume. It is accessible on the
|
||||
# host at the same path.
|
||||
libvirt_vm_default_console_log_dir: "/var/log/kolla/tenks"
|
||||
|
||||
python_upper_constraints_url: "https://releases.openstack.org/constraints/upper/yoga"
|
||||
|
@ -55,5 +55,3 @@ libvirt_vm_default_console_log_dir: "/var/log/kolla/tenks"
|
||||
# Console logs are owned by the ID of the Nova user in the nova_libvirt
|
||||
# container.
|
||||
libvirt_vm_log_owner: 42436
|
||||
|
||||
python_upper_constraints_url: "https://releases.openstack.org/constraints/upper/yoga"
|
||||
|
@ -42,5 +42,3 @@ wait_for_placement: false
|
||||
# Nested virtualisation is not working well in CI currently. Force the use of
|
||||
# QEMU.
|
||||
libvirt_vm_engine: "qemu"
|
||||
|
||||
python_upper_constraints_url: "https://releases.openstack.org/constraints/upper/yoga"
|
||||
|
@ -5,7 +5,6 @@
|
||||
KAYOBE_OVERCLOUD_GENERATE_CERTIFICATES: "{{ tls_enabled | ternary(1, 0) }}"
|
||||
# TODO(mgoddard): Remove this when libvirt on host is used by default.
|
||||
TENKS_CONFIG_PATH: "dev/tenks-deploy-config-compute{% if tls_enabled %}-libvirt-on-host{% endif %}.yml"
|
||||
UPPER_CONSTRAINTS_FILE: "https://releases.openstack.org/constraints/upper/yoga"
|
||||
tasks:
|
||||
- name: Ensure overcloud is deployed
|
||||
shell:
|
||||
|
@ -1,7 +1,5 @@
|
||||
---
|
||||
- hosts: primary
|
||||
environment:
|
||||
UPPER_CONSTRAINTS_FILE: "https://releases.openstack.org/constraints/upper/yoga"
|
||||
tasks:
|
||||
|
||||
# Install the previous release of Kayobe, and use it to deploy a control
|
||||
|
@ -71,7 +71,6 @@
|
||||
- name: openstack/kolla
|
||||
- name: openstack/kolla-ansible
|
||||
- name: openstack/requirements
|
||||
override-checkout: stable/yoga
|
||||
- name: openstack/tenks
|
||||
irrelevant-files:
|
||||
- ^\..+
|
||||
|
Loading…
Reference in New Issue
Block a user