Skip to content

OpenStack: remove mentions of ML2 #2707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nelljerram wants to merge 2 commits into
base: main
Choose a base branch
from
Open

OpenStack: remove mentions of ML2 #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43e927b
OpenStack: remove mentions of ML2
nelljerram May 8, 2026
b428592
Markups for Copilot comments
nelljerram May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions calico/getting-started/openstack/installation/redhat.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ combined control and compute node, work through all three sections.
Enterprise Linux (RHEL) hosts.
- Make sure you have working DNS between the RHEL hosts (use `/etc/hosts` if you
don't have DNS on your network).
- [Install OpenStack with Neutron and ML2 networking](http://docs.openstack.org)
on the RHEL hosts.
- [Install OpenStack](http://docs.openstack.org) on the RHEL hosts.
Comment thread
nelljerram marked this conversation as resolved.

## Common steps

Expand Down
3 changes: 1 addition & 2 deletions calico/getting-started/openstack/installation/ubuntu.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ combined control and compute node, work through all three sections.
- Ensure that you meet the [requirements](../requirements.mdx).
- Confirm that you have SSH access to and root privileges on one or more Ubuntu hosts
(your OpenStack compute or control nodes).
- [Install OpenStack with Neutron and ML2 networking](http://docs.openstack.org)
on the Ubuntu hosts.
- [Install OpenStack](http://docs.openstack.org) on the Ubuntu hosts.
Comment thread
nelljerram marked this conversation as resolved.

## Common steps

Expand Down
2 changes: 1 addition & 1 deletion calico/network-policy/comms/crypto-auth.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ its connections as follows.
- [Felix](../../reference/felix/configuration.mdx#etcd-datastore-configuration)
- [Typha](../../reference/typha/configuration.mdx#etcd-datastore-configuration) (often deployed in
larger Kubernetes deployments)
- [Neutron plugin or ML2 driver](../../networking/openstack/configuration.mdx#neutron-server-etcneutronneutronconf) (OpenStack only)
- [Neutron plugin](../../networking/openstack/configuration.mdx#neutron-server-etcneutronneutronconf) (OpenStack only)
- [DHCP agent](../../networking/openstack/configuration.mdx#neutron-server-etcneutronneutronconf) (OpenStack only)

</TabItem>
Expand Down
26 changes: 1 addition & 25 deletions calico/networking/openstack/configuration.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,8 @@ configure the Neutron service.
| -------------------- | --------- | ---------------------------------------- |
| core_plugin | calico | Use the $[prodname] core plugin |

$[prodname] can operate either as a core plugin or as an ML2 mechanism driver. The
function is the same both ways, except that floating IPs are only supported
when operating as a core plugin; hence the recommended setting here.

However, if you don't need floating IPs and have other reasons for using ML2,
you can, instead, set

| Setting | Value | Meaning |
| -------------------- | -------------------------------------- | ---------------------- |
| core_plugin | neutron.plugins.ml2.plugin.ML2Plugin | Use ML2 plugin |

and then the further ML2-specific configuration as covered below.

The following options in the `[calico]` section of `/etc/neutron/neutron.conf` govern how
the $[prodname] plugin/driver and DHCP agent connect to the $[prodname] etcd
the $[prodname] plugin and DHCP agent connect to the $[prodname] etcd
datastore. You should set `etcd_host` to the IP of your etcd server, and `etcd_port` if
that server is using a non-standard port. If the etcd server is TLS-secured, also set:

Expand Down Expand Up @@ -72,14 +59,3 @@ When specified, the value of `openstack_region` must be a string of lower case a
characters or '-', starting and ending with an alphanumeric character, and must match the value of
[`OpenStackRegion`](../../reference/felix/configuration.mdx#openstack-specific-configuration)
configured for the Felixes in the same region.

## ML2 (.../ml2_conf.ini)

In `/etc/neutron/plugins/ml2/ml2_conf.ini` you need the following
settings to configure the ML2 plugin.

| Setting | Value | Meaning |
| -------------------- | ----------- | --------------------------------- |
| mechanism_drivers | calico | Use $[prodname] |
| type_drivers | local, flat | Allow 'local' and 'flat' networks |
| tenant_network_types | local, flat | Allow 'local' and 'flat' networks |
10 changes: 1 addition & 9 deletions calico/networking/openstack/floating-ips.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@ description: Configure floating IPs in Calico for OpenStack.

# Floating IPs

networking-calico includes beta support for floating IPs. Currently this
requires running $[prodname] as a Neutron core plugin (i.e. `core_plugin = calico`) instead of as an ML2 mechanism driver.

:::note

We would like it to work as an ML2 mechanism driver too—patches
and/or advice welcome!

:::
networking-calico includes support for floating IPs.
Comment thread
nelljerram marked this conversation as resolved.

To set up a floating IP, you need the same pattern of Neutron data model
objects as you do for Neutron in general, which means:
Expand Down
2 changes: 1 addition & 1 deletion calico/networking/openstack/kuryr.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Use Kuryr with Calico networking.
# Kuryr

networking-calico works with Kuryr; this means using Neutron, with the $[prodname]
ML2 driver, to provide networking for container workloads.
core plugin, to provide networking for container workloads.

You can use DevStack to install a single node $[prodname]/Kuryr system, with a
`local.conf` file like this:
Expand Down
2 changes: 1 addition & 1 deletion calico/networking/openstack/neutron-api.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ All the attributes of security groups remain unchanged in $[prodname].

## Floating IPs

Floating IPs are supported at beta level. For more information, see [Floating IPs](floating-ips.mdx).
Floating IPs are supported. For more information, see [Floating IPs](floating-ips.mdx).

## Neutron Routers

Expand Down
2 changes: 1 addition & 1 deletion calico/networking/openstack/semantics.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Calico provides connectivity that is different from traditional Neu

A $[prodname] network is a Neutron network (either provider or tenant) whose
connectivity is implemented, on every compute host with instances attached to
that network, by the `calico` plugin or ML2 mechanism driver. There can be
that network, by the `calico` plugin. There can be
just one $[prodname] network, or any number of them. This page describes the
connectivity that $[prodname] provides between instances attached to the same
network, and between instances attached to different $[prodname] networks, and
Expand Down
2 changes: 1 addition & 1 deletion calico/reference/faq.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ The bulk of global state is mastered in whatever component hosts the
plugin.

- In the case of OpenStack, this means a Neutron database. Our
OpenStack plugin (more strictly a Neutron ML2 driver) queries the
OpenStack plugin queries the
Neutron database to find out state about the entire deployment. That
state is then reflected to `etcd` and so to Felix.
- In certain cases, `etcd` itself contains the master copy of
Expand Down
3 changes: 1 addition & 2 deletions ...o_versioned_docs/version-3.32/getting-started/openstack/installation/redhat.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ combined control and compute node, work through all three sections.
Enterprise Linux (RHEL) hosts.
- Make sure you have working DNS between the RHEL hosts (use `/etc/hosts` if you
don't have DNS on your network).
- [Install OpenStack with Neutron and ML2 networking](http://docs.openstack.org)
on the RHEL hosts.
- [Install OpenStack](http://docs.openstack.org) on the RHEL hosts.
Comment thread
nelljerram marked this conversation as resolved.

## Common steps

Expand Down
3 changes: 1 addition & 2 deletions ...o_versioned_docs/version-3.32/getting-started/openstack/installation/ubuntu.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ combined control and compute node, work through all three sections.
- Ensure that you meet the [requirements](../requirements.mdx).
- Confirm that you have SSH access to and root privileges on one or more Ubuntu hosts
(your OpenStack compute or control nodes).
- [Install OpenStack with Neutron and ML2 networking](http://docs.openstack.org)
on the Ubuntu hosts.
- [Install OpenStack](http://docs.openstack.org) on the Ubuntu hosts.
Comment thread
nelljerram marked this conversation as resolved.

## Common steps

Expand Down
2 changes: 1 addition & 1 deletion calico_versioned_docs/version-3.32/network-policy/comms/crypto-auth.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ its connections as follows.
- [Felix](../../reference/felix/configuration.mdx#etcd-datastore-configuration)
- [Typha](../../reference/typha/configuration.mdx#etcd-datastore-configuration) (often deployed in
larger Kubernetes deployments)
- [Neutron plugin or ML2 driver](../../networking/openstack/configuration.mdx#neutron-server-etcneutronneutronconf) (OpenStack only)
- [Neutron plugin](../../networking/openstack/configuration.mdx#neutron-server-etcneutronneutronconf) (OpenStack only)
- [DHCP agent](../../networking/openstack/configuration.mdx#neutron-server-etcneutronneutronconf) (OpenStack only)

</TabItem>
Expand Down
26 changes: 1 addition & 25 deletions calico_versioned_docs/version-3.32/networking/openstack/configuration.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,8 @@ configure the Neutron service.
| -------------------- | --------- | ---------------------------------------- |
| core_plugin | calico | Use the $[prodname] core plugin |

$[prodname] can operate either as a core plugin or as an ML2 mechanism driver. The
function is the same both ways, except that floating IPs are only supported
when operating as a core plugin; hence the recommended setting here.

However, if you don't need floating IPs and have other reasons for using ML2,
you can, instead, set

| Setting | Value | Meaning |
| -------------------- | -------------------------------------- | ---------------------- |
| core_plugin | neutron.plugins.ml2.plugin.ML2Plugin | Use ML2 plugin |

and then the further ML2-specific configuration as covered below.

The following options in the `[calico]` section of `/etc/neutron/neutron.conf` govern how
the $[prodname] plugin/driver and DHCP agent connect to the $[prodname] etcd
the $[prodname] plugin and DHCP agent connect to the $[prodname] etcd
datastore. You should set `etcd_host` to the IP of your etcd server, and `etcd_port` if
that server is using a non-standard port. If the etcd server is TLS-secured, also set:

Expand Down Expand Up @@ -72,14 +59,3 @@ When specified, the value of `openstack_region` must be a string of lower case a
characters or '-', starting and ending with an alphanumeric character, and must match the value of
[`OpenStackRegion`](../../reference/felix/configuration.mdx#openstack-specific-configuration)
configured for the Felixes in the same region.

## ML2 (.../ml2_conf.ini)

In `/etc/neutron/plugins/ml2/ml2_conf.ini` you need the following
settings to configure the ML2 plugin.

| Setting | Value | Meaning |
| -------------------- | ----------- | --------------------------------- |
| mechanism_drivers | calico | Use $[prodname] |
| type_drivers | local, flat | Allow 'local' and 'flat' networks |
| tenant_network_types | local, flat | Allow 'local' and 'flat' networks |
10 changes: 1 addition & 9 deletions calico_versioned_docs/version-3.32/networking/openstack/floating-ips.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,7 @@ description: Configure floating IPs in Calico for OpenStack.

# Floating IPs

networking-calico includes beta support for floating IPs. Currently this
requires running $[prodname] as a Neutron core plugin (i.e. `core_plugin = calico`) instead of as an ML2 mechanism driver.

:::note

We would like it to work as an ML2 mechanism driver too—patches
and/or advice welcome!

:::
networking-calico includes support for floating IPs.
Comment thread
nelljerram marked this conversation as resolved.

To set up a floating IP, you need the same pattern of Neutron data model
objects as you do for Neutron in general, which means:
Expand Down
2 changes: 1 addition & 1 deletion calico_versioned_docs/version-3.32/networking/openstack/kuryr.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Use Kuryr with Calico networking.
# Kuryr

networking-calico works with Kuryr; this means using Neutron, with the $[prodname]
ML2 driver, to provide networking for container workloads.
core plugin, to provide networking for container workloads.

You can use DevStack to install a single node $[prodname]/Kuryr system, with a
`local.conf` file like this:
Expand Down
2 changes: 1 addition & 1 deletion calico_versioned_docs/version-3.32/networking/openstack/neutron-api.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ All the attributes of security groups remain unchanged in $[prodname].

## Floating IPs

Floating IPs are supported at beta level. For more information, see [Floating IPs](floating-ips.mdx).
Floating IPs are supported. For more information, see [Floating IPs](floating-ips.mdx).

## Neutron Routers

Expand Down
2 changes: 1 addition & 1 deletion calico_versioned_docs/version-3.32/networking/openstack/semantics.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description: Calico provides connectivity that is different from traditional Neu

A $[prodname] network is a Neutron network (either provider or tenant) whose
connectivity is implemented, on every compute host with instances attached to
that network, by the `calico` plugin or ML2 mechanism driver. There can be
that network, by the `calico` plugin. There can be
just one $[prodname] network, or any number of them. This page describes the
connectivity that $[prodname] provides between instances attached to the same
network, and between instances attached to different $[prodname] networks, and
Expand Down
2 changes: 1 addition & 1 deletion calico_versioned_docs/version-3.32/reference/faq.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ The bulk of global state is mastered in whatever component hosts the
plugin.

- In the case of OpenStack, this means a Neutron database. Our
OpenStack plugin (more strictly a Neutron ML2 driver) queries the
OpenStack plugin queries the
Neutron database to find out state about the entire deployment. That
state is then reflected to `etcd` and so to Felix.
- In certain cases, `etcd` itself contains the master copy of
Expand Down
Loading