Merge "Adds support for Ansible 2.7, bump mimimum to 2.5"

This commit is contained in:
Zuul 2019-07-12 21:28:37 +00:00 committed by Gerrit Code Review
commit 8076acdb74
5 changed files with 24 additions and 22 deletions

View File

@ -283,18 +283,19 @@
- config
- config-validation
roles:
- role: kolla-ansible
kolla_ansible_install_epel: "{{ yum_install_epel }}"
kolla_external_fqdn_cert: "{{ kolla_config_path }}/certificates/haproxy.pem"
kolla_ansible_passwords_path: "{{ kayobe_config_path }}/kolla/passwords.yml"
# NOTE: This differs from the default SELinux mode in kolla ansible,
# which is permissive. The justification for using this mode is twofold:
# 1. it avoids filling up the audit log
# 2. it avoids an issue seen when using diskimage-builder in the bifrost
# container.
# We could look at making the SELinux mode configurable in future.
kolla_selinux_state: disabled
kolla_inspector_dhcp_pool_start: "{{ inspection_net_name | net_inspection_allocation_pool_start }}"
kolla_inspector_dhcp_pool_end: "{{ inspection_net_name | net_inspection_allocation_pool_end }}"
kolla_inspector_default_gateway: "{{ inspection_net_name | net_inspection_gateway or inspection_net_name | net_gateway }}"
- import_role:
name: kolla-ansible
vars:
kolla_ansible_install_epel: "{{ yum_install_epel }}"
kolla_external_fqdn_cert: "{{ kolla_config_path }}/certificates/haproxy.pem"
kolla_ansible_passwords_path: "{{ kayobe_config_path }}/kolla/passwords.yml"
# NOTE: This differs from the default SELinux mode in kolla ansible,
# which is permissive. The justification for using this mode is twofold:
# 1. it avoids filling up the audit log
# 2. it avoids an issue seen when using diskimage-builder in the bifrost
# container.
# We could look at making the SELinux mode configurable in future.
kolla_selinux_state: disabled
kolla_inspector_dhcp_pool_start: "{{ inspection_net_name | net_inspection_allocation_pool_start }}"
kolla_inspector_dhcp_pool_end: "{{ inspection_net_name | net_inspection_allocation_pool_end }}"
kolla_inspector_default_gateway: "{{ inspection_net_name | net_inspection_gateway or inspection_net_name | net_gateway }}"

View File

@ -7,7 +7,7 @@ kolla-ansible=={{ kolla_openstack_release }}
{% endif %}
# Limit the version of ansible used by kolla-ansible to avoid new releases from
# breaking tested code. Changes to this limit should be tested.
ansible<2.7
ansible>=2.5,<2.8
{% if kolla_ansible_venv_extra_requirements is defined %}
{% for item in kolla_ansible_venv_extra_requirements %}
{{ item }}

View File

@ -53,7 +53,6 @@
- name: Test the kolla-ansible role with default values
include_role:
name: ../../kolla-ansible
static: False
vars:
kolla_ansible_source_path: "{{ temp_path }}/src"
kolla_ansible_ctl_install_type: "source"

View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Updates the minimum supported version of Ansible from 2.4 to 2.5, and the
maximum supported version from 2.6 to 2.7. This is true for both Kayobe and
Kolla Ansible.

View File

@ -3,11 +3,7 @@
# process, which may cause wedges in the gate later.
pbr>=2.0 # Apache-2.0
# Ansible 2.3 has a bug (#30350) in the Dell network modules. Pull in a version
# with the fix backported. It can be installed by uncommenting the following
# line and commenting the one after.
# -e git+https://github.com/stackhpc/ansible@issue-30350-2.3#egg=ansible-issue-30350-2.3 # GPLv3
ansible>=2.4.0,<2.7.0 # GPLv3
ansible>=2.5.0,<2.8.0 # GPLv3
cliff>=2.5.0,<2.15.0 # Apache
netaddr!=0.7.16,>=0.7.13 # BSD
PyYAML>=3.10.0 # MIT