CI: Add linuxbridge jobs

global_physnet_mtu needs to be set in neutron.conf, because linuxbridge-agent
discovers underlying vxlan0 interface mtu and returns an error when creating
vxlan port

CentOS8 job will not be added, because CentOS 8 iptables-ebtables package
is missing broute (--among-src) tables support required for linuxbridge agent,
see [1].

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1720637

Change-Id: I6b12f7ba95401d3342359c57ceeee8bec8aefe49
This commit is contained in:
Michal Nasiadka
2020-02-18 09:18:41 +01:00
parent 35c3f333e9
commit f7bc4d78d9
6 changed files with 40 additions and 1 deletions

View File

@@ -21,7 +21,7 @@
need_build_image: false need_build_image: false
build_image_tag: "change_{{ zuul.change | default('none') }}" build_image_tag: "change_{{ zuul.change | default('none') }}"
openstack_core_enabled: "{{ openstack_core_enabled }}" openstack_core_enabled: "{{ openstack_core_enabled }}"
openstack_core_tested: "{{ scenario in ['core', 'ceph-ansible', 'zun', 'cells', 'swift'] }}" openstack_core_tested: "{{ scenario in ['core', 'ceph-ansible', 'zun', 'cells', 'swift', 'linuxbridge'] }}"
dashboard_enabled: "{{ openstack_core_enabled }}" dashboard_enabled: "{{ openstack_core_enabled }}"
# TODO(mgoddard): Remove when previous_release is ussuri. # TODO(mgoddard): Remove when previous_release is ussuri.
playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' else '3' }}" playbook_python_version: "{{ '2' if is_upgrade and previous_release == 'train' else '3' }}"
@@ -102,6 +102,7 @@
loop: loop:
- cinder - cinder
- glance - glance
- neutron
- nova - nova
- bifrost - bifrost
- swift - swift
@@ -124,6 +125,10 @@
- src: "tests/templates/nova-compute-overrides.j2" - src: "tests/templates/nova-compute-overrides.j2"
dest: /etc/kolla/config/nova/nova-compute.conf dest: /etc/kolla/config/nova/nova-compute.conf
when: "{{ openstack_core_enabled }}" when: "{{ openstack_core_enabled }}"
# neutron.conf
- src: "tests/templates/neutron-server-overrides.j2"
dest: /etc/kolla/config/neutron.conf
when: "{{ openstack_core_enabled }}"
# bifrost/dib.yml # bifrost/dib.yml
- src: "tests/templates/bifrost-dib-overrides.j2" - src: "tests/templates/bifrost-dib-overrides.j2"
dest: /etc/kolla/config/bifrost/dib.yml dest: /etc/kolla/config/bifrost/dib.yml

View File

@@ -120,3 +120,7 @@ openstack_cacert: "/usr/local/share/ca-certificates/kolla-customca-haproxy-inter
openstack_cacert: "/etc/pki/ca-trust/source/anchors/kolla-customca-haproxy-internal.crt" openstack_cacert: "/etc/pki/ca-trust/source/anchors/kolla-customca-haproxy-internal.crt"
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if scenario == 'linuxbridge' %}
neutron_plugin_agent: "linuxbridge"
{% endif %}

View File

@@ -0,0 +1,2 @@
[DEFAULT]
global_physnet_mtu={{ ansible_vxlan0.mtu }}

View File

@@ -144,3 +144,13 @@
voting: false voting: false
vars: vars:
scenario: cells scenario: cells
- job:
name: kolla-ansible-linuxbridge-base
parent: kolla-ansible-base
voting: false
files:
- ^ansible/roles/neutron/
- ^tests/test-core-openstack.sh
vars:
scenario: linuxbridge

View File

@@ -336,3 +336,19 @@
vars: vars:
base_distro: centos base_distro: centos
install_type: source install_type: source
- job:
name: kolla-ansible-centos-source-linuxbridge
parent: kolla-ansible-linuxbridge-base
nodeset: kolla-ansible-centos
vars:
base_distro: centos
install_type: source
- job:
name: kolla-ansible-ubuntu-source-linuxbridge
parent: kolla-ansible-linuxbridge-base
nodeset: kolla-ansible-bionic
vars:
base_distro: ubuntu
install_type: source

View File

@@ -50,6 +50,8 @@
- kolla-ansible-ubuntu-source-ceph-ansible - kolla-ansible-ubuntu-source-ceph-ansible
- kolla-ansible-centos-source-upgrade-ceph-ansible - kolla-ansible-centos-source-upgrade-ceph-ansible
- kolla-ansible-ubuntu-source-upgrade-ceph-ansible - kolla-ansible-ubuntu-source-upgrade-ceph-ansible
- kolla-ansible-centos-source-linuxbridge
- kolla-ansible-ubuntu-source-linuxbridge
check-arm64: check-arm64:
jobs: jobs:
- kolla-ansible-debian-source-aarch64 - kolla-ansible-debian-source-aarch64