diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-09 13:14:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-09 13:14:58 +0000 |
| commit | 05194e76180e63d61f54c77af41238fd6927a95d (patch) | |
| tree | 81224d2824b5e57f0bc3a33d0f872ef9996dc3d9 | |
| parent | a1f55b5bdf983a6d636c320185d5adc4b7ea5fda (diff) | |
| parent | 90a54acabd6b011cf30bb7056c364693c2b04437 (diff) | |
| download | kolla-05194e76180e63d61f54c77af41238fd6927a95d.tar.gz kolla-05194e76180e63d61f54c77af41238fd6927a95d.zip | |
Merge "Honour the linuxbridge experimental status"
| -rw-r--r-- | .zuul.d/ubuntu.yaml | 4 | ||||
| -rw-r--r-- | README.rst | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml index 1e234e942..5964fe4b0 100644 --- a/.zuul.d/ubuntu.yaml +++ b/.zuul.d/ubuntu.yaml @@ -59,10 +59,6 @@ files: ^docker/(base|masakari|openstack-base)/ vars: kolla_python_version: "3.10" - - kolla-ansible-ubuntu-source-linuxbridge: - files: ^docker/(base|neutron|openstack-base)/ - vars: - kolla_python_version: "3.10" - kolla-ansible-ubuntu-source-octavia: files: ^docker/(base|neutron|octavia|openstack-base|openvswitch|ovn)/ vars: diff --git a/README.rst b/README.rst index ee5c893d5..bb5535075 100644 --- a/README.rst +++ b/README.rst @@ -130,7 +130,7 @@ Kolla provides images to deploy the following infrastructure components: - `MariaDB and Galera Cluster <https://mariadb.com/kb/en/library/galera-cluster/>`__ for highly available MySQL databases. - `Memcached <https://www.memcached.org/>`__ a distributed memory object caching system. -- `Open vSwitch <https://www.openvswitch.org/>`__ and Linuxbridge back ends for Neutron. +- `Open vSwitch <https://openvswitch.org/>`__ for use with Neutron. - MariaDB Backup A tool which provides a method of performing a hot backup of your MySQL data while the system is running. - `Prometheus <https://prometheus.io/>`__ an open-source systems monitoring |
