openstack/kayobe
Code Issues Proposed changes

Revert "Use OpenStack Train release"

Browse Source 
This reverts commit a93b85ba07.

The local Python executable for Kolla Ansible is changed to Python 3
because Kolla Ansible master no longer supports Python 2.

Change-Id: I768ce8db9cec1c70d94f271997bbcc64d370403e
This commit is contained in:
Pierre Riteau 2020-01-09 16:00:06 +01:00 committed by Mark Goddard
parent 6b47717c43
commit c9474bf9b0
5 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/group_vars/all/openstack
View File

@ -2,10 +2,10 @@
############################################################################### ###############################################################################
# OpenStack release configuration. # OpenStack release configuration.
# Name of the current OpenStack release. Default is "train". # Name of the current OpenStack release. Default is "master".
openstack_release: "train" openstack_release: "master"
# Name of the current OpenStack branch. Default is "stable/train". # Name of the current OpenStack branch. Default is "master".
openstack_branch: >- openstack_branch: >-
{% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}

2
ansible/roles/kolla-ansible/defaults/main.yml
View File

@ -21,7 +21,7 @@ kolla_ansible_venv_python: "python{{ kolla_ansible_venv_python_major_version }}"
# Major version of Python interpreter used in Kolla Ansible virtualenv. # Major version of Python interpreter used in Kolla Ansible virtualenv.
# FIXME(mgoddard): Use ansible_python when Kayobe supports Python 3. # FIXME(mgoddard): Use ansible_python when Kayobe supports Python 3.
kolla_ansible_venv_python_major_version: 2 kolla_ansible_venv_python_major_version: 3
# Virtualenv directory where Kolla-ansible's ansible modules will execute # Virtualenv directory where Kolla-ansible's ansible modules will execute
# remotely on the target nodes. If None, no virtualenv will be used. # remotely on the target nodes. If None, no virtualenv will be used.

4
etc/kayobe/openstack.yml
View File

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

12
tox.ini
View File

@ -19,7 +19,7 @@ setenv =
OS_STDERR_CAPTURE=1 OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60 OS_TEST_TIMEOUT=60
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = stestr run {posargs} commands = stestr run {posargs}
@ -27,7 +27,7 @@ commands = stestr run {posargs}
[testenv:pep8] [testenv:pep8]
# sphinx8 needs the sphinx package which is required via doc/requirements.txt # sphinx8 needs the sphinx package which is required via doc/requirements.txt
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
@ -42,7 +42,7 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = {posargs} commands = {posargs}
@ -64,7 +64,7 @@ commands =
[testenv:molecule] [testenv:molecule]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
whitelist_externals = whitelist_externals =
@ -113,7 +113,7 @@ commands =
[testenv:docs] [testenv:docs]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =
@ -133,7 +133,7 @@ commands = oslo_debug_helper {posargs}
[testenv:releasenotes] [testenv:releasenotes]
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/train} -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
commands = commands =

6
zuul.d/jobs.yaml
View File

@ -58,14 +58,8 @@
- name: openstack/kayobe - name: openstack/kayobe
- name: openstack/kayobe-config-dev - name: openstack/kayobe-config-dev
- name: openstack/kolla - name: openstack/kolla
# TODO(mgoddard): Remove when Ansible playbooks support Python 3.
override-checkout: stable/train
- name: openstack/kolla-ansible - name: openstack/kolla-ansible
# TODO(mgoddard): Remove when Ansible playbooks support Python 3.
override-checkout: stable/train
- name: openstack/requirements - name: openstack/requirements
# TODO(mgoddard): Remove when Ansible playbooks support Python 3.
override-checkout: stable/train
- name: openstack/tenks - name: openstack/tenks
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$