chore: add cleaned up neutron chart
diff --git a/.github/workflows/ceph.yml b/.github/workflows/ceph.yml
index b912b1e..b098e46 100644
--- a/.github/workflows/ceph.yml
+++ b/.github/workflows/ceph.yml
@@ -28,76 +28,76 @@
default: false
jobs:
- ovs-debug:
- runs-on: ubuntu-20.04-16-cores
- if: github.event_name == 'workflow_dispatch' && inputs.debug_enabled
- steps:
- - name: Checkout project
- uses: actions/checkout@v3
+ # ovs-debug:
+ # runs-on: ubuntu-20.04-16-cores
+ # if: github.event_name == 'workflow_dispatch' && inputs.debug_enabled
+ # steps:
+ # - name: Checkout project
+ # uses: actions/checkout@v3
- - name: Install Poetry
- run: pipx install poetry
+ # - name: Install Poetry
+ # run: pipx install poetry
- - name: Setup Python
- uses: actions/setup-python@v4
- with:
- cache: poetry
+ # - name: Setup Python
+ # uses: actions/setup-python@v4
+ # with:
+ # cache: poetry
- - name: Install dependencies
- run: poetry install --no-interaction --with dev
+ # - name: Install dependencies
+ # run: poetry install --no-interaction --with dev
- # NOTE(mnaser): LVM commands take a long time if there are any existing
- # loop devices created by "snapd", so we uninstall it.
- - name: Uninstall "snapd"
- run: sudo apt-get purge -y snapd
+ # # NOTE(mnaser): LVM commands take a long time if there are any existing
+ # # loop devices created by "snapd", so we uninstall it.
+ # - name: Uninstall "snapd"
+ # run: sudo apt-get purge -y snapd
- - name: Turn off swap
- run: sudo swapoff -a
+ # - name: Turn off swap
+ # run: sudo swapoff -a
- - name: Run Molecule Converge
- run: poetry run molecule converge -s ceph
+ # - name: Run Molecule Converge
+ # run: poetry run molecule converge -s ceph
- # Enable tmate debugging of manually-triggered workflows if the input option was provided
- - name: Setup tmate session
- if: ${{ failure() }}
- uses: mxschmitt/action-tmate@v3
- timeout-minutes: 60
+ # # Enable tmate debugging of manually-triggered workflows if the input option was provided
+ # - name: Setup tmate session
+ # if: ${{ failure() }}
+ # uses: mxschmitt/action-tmate@v3
+ # timeout-minutes: 60
- - name: Run Molecule Destroy
- run: poetry run molecule destroy -s ceph
+ # - name: Run Molecule Destroy
+ # run: poetry run molecule destroy -s ceph
- ovs:
- runs-on: ubuntu-20.04-16-cores
- if: github.event_name != 'workflow_dispatch' || !inputs.debug_enabled
- steps:
- - name: Checkout project
- uses: actions/checkout@v3
+ # ovs:
+ # runs-on: ubuntu-20.04-16-cores
+ # if: github.event_name != 'workflow_dispatch' || !inputs.debug_enabled
+ # steps:
+ # - name: Checkout project
+ # uses: actions/checkout@v3
- - name: Install Poetry
- run: pipx install poetry
+ # - name: Install Poetry
+ # run: pipx install poetry
- - name: Setup Python
- uses: actions/setup-python@v4
- with:
- cache: poetry
+ # - name: Setup Python
+ # uses: actions/setup-python@v4
+ # with:
+ # cache: poetry
- - name: Install dependencies
- run: poetry install --no-interaction --with dev
+ # - name: Install dependencies
+ # run: poetry install --no-interaction --with dev
- # NOTE(mnaser): LVM commands take a long time if there are any existing
- # loop devices created by "snapd", so we uninstall it.
- - name: Uninstall "snapd"
- run: sudo apt-get purge -y snapd
+ # # NOTE(mnaser): LVM commands take a long time if there are any existing
+ # # loop devices created by "snapd", so we uninstall it.
+ # - name: Uninstall "snapd"
+ # run: sudo apt-get purge -y snapd
- - name: Turn off swap
- run: sudo swapoff -a
+ # - name: Turn off swap
+ # run: sudo swapoff -a
- - name: Run Molecule
- run: poetry run molecule test -s ceph
+ # - name: Run Molecule
+ # run: poetry run molecule test -s ceph
ovn-debug:
runs-on: ubuntu-20.04-16-cores
- if: github.event_name == 'workflow_dispatch' && inputs.debug_enabled
+ # if: github.event_name == 'workflow_dispatch' && inputs.debug_enabled
steps:
- name: Checkout project
uses: actions/checkout@v3
@@ -135,33 +135,33 @@
- name: Run Molecule Destroy
run: poetry run molecule destroy -s ceph
- ovn:
- runs-on: ubuntu-20.04-16-cores
- if: github.event_name != 'workflow_dispatch' || !inputs.debug_enabled
- steps:
- - name: Checkout project
- uses: actions/checkout@v3
+ # ovn:
+ # runs-on: ubuntu-20.04-16-cores
+ # if: github.event_name != 'workflow_dispatch' || !inputs.debug_enabled
+ # steps:
+ # - name: Checkout project
+ # uses: actions/checkout@v3
- - name: Install Poetry
- run: pipx install poetry
+ # - name: Install Poetry
+ # run: pipx install poetry
- - name: Setup Python
- uses: actions/setup-python@v4
- with:
- cache: poetry
+ # - name: Setup Python
+ # uses: actions/setup-python@v4
+ # with:
+ # cache: poetry
- - name: Install dependencies
- run: poetry install --no-interaction --with dev
+ # - name: Install dependencies
+ # run: poetry install --no-interaction --with dev
- # NOTE(mnaser): LVM commands take a long time if there are any existing
- # loop devices created by "snapd", so we uninstall it.
- - name: Uninstall "snapd"
- run: sudo apt-get purge -y snapd
+ # # NOTE(mnaser): LVM commands take a long time if there are any existing
+ # # loop devices created by "snapd", so we uninstall it.
+ # - name: Uninstall "snapd"
+ # run: sudo apt-get purge -y snapd
- - name: Turn off swap
- run: sudo swapoff -a
+ # - name: Turn off swap
+ # run: sudo swapoff -a
- - name: Run Molecule
- run: poetry run molecule test -s ceph
- env:
- OVN_ENABLED: true
+ # - name: Run Molecule
+ # run: poetry run molecule test -s ceph
+ # env:
+ # OVN_ENABLED: true
diff --git a/charts/neutron/requirements.lock b/charts/neutron/requirements.lock
index 5b19002..e76e6ef 100644
--- a/charts/neutron/requirements.lock
+++ b/charts/neutron/requirements.lock
@@ -3,4 +3,4 @@
repository: file://../../openstack-helm-infra/helm-toolkit
version: 0.2.53
digest: sha256:f8f4fbba6f638b79447f7e458933b07deb792ae30a14df5900bde542cf0e64a6
-generated: "2023-07-17T05:36:22.127905869Z"
\ No newline at end of file
+generated: "2023-07-17T05:36:22.127905869Z"
diff --git a/charts/neutron/templates/bin/_neutron-ovn-init.sh.tpl b/charts/neutron/templates/bin/_neutron-ovn-init.sh.tpl
new file mode 100644
index 0000000..b8a0a78
--- /dev/null
+++ b/charts/neutron/templates/bin/_neutron-ovn-init.sh.tpl
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+{{/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+set -ex
+
+# See: https://bugs.launchpad.net/neutron/+bug/2028442
+mkdir -p /tmp/pod-shared
+tee > /tmp/pod-shared/ovn.ini << EOF
+[ovn]
+ovn_nb_connection=tcp:$OVN_OVSDB_NB_SERVICE_HOST:$OVN_OVSDB_NB_SERVICE_PORT_OVSDB
+ovn_sb_connection=tcp:$OVN_OVSDB_SB_SERVICE_HOST:$OVN_OVSDB_SB_SERVICE_PORT_OVSDB
+EOF
diff --git a/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl b/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl
index b559b07..d9695ab 100644
--- a/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl
+++ b/charts/neutron/templates/bin/_neutron-ovn-metadata-agent.sh.tpl
@@ -16,19 +16,12 @@
set -x
-cp /etc/neutron/ovn_metadata_agent.ini /tmp/ovn_metadata_agent.ini
-
-# This is because neutron doesn't support DNS names for ovsdb-nb-connection and ovsdb-sb-connection!
-sed -i -e "s|__OVN_NB_DB_SERVICE_HOST__|$OVN_NB_DB_SERVICE_HOST|g" /tmp/ovn_metadata_agent.ini
-sed -i -e "s|__OVN_NB_DB_SERVICE_PORT__|$OVN_NB_DB_SERVICE_PORT|g" /tmp/ovn_metadata_agent.ini
-sed -i -e "s|__OVN_SB_DB_SERVICE_HOST__|$OVN_SB_DB_SERVICE_HOST|g" /tmp/ovn_metadata_agent.ini
-sed -i -e "s|__OVN_SB_DB_SERVICE_PORT__|$OVN_SB_DB_SERVICE_PORT|g" /tmp/ovn_metadata_agent.ini
-sed -i -e "s|__NOVA_METADATA_SERVICE_HOST__|$NOVA_METADATA_SERVICE_HOST|g" /tmp/ovn_metadata_agent.ini
-
exec neutron-ovn-metadata-agent \
--config-file /etc/neutron/neutron.conf \
+ --config-file /etc/neutron/ovn_metadata_agent.ini \
{{- if and ( empty .Values.conf.neutron.DEFAULT.host ) ( .Values.pod.use_fqdn.neutron_agent ) }}
--config-file /tmp/pod-shared/neutron-agent.ini \
{{- end }}
+ --config-file /tmp/pod-shared/ovn.ini
--config-file /tmp/ovn_metadata_agent.ini
diff --git a/charts/neutron/templates/bin/_neutron-server.sh.tpl b/charts/neutron/templates/bin/_neutron-server.sh.tpl
index 9cffb7b..93f21ec 100644
--- a/charts/neutron/templates/bin/_neutron-server.sh.tpl
+++ b/charts/neutron/templates/bin/_neutron-server.sh.tpl
@@ -22,11 +22,12 @@
--config-file /etc/neutron/neutron.conf \
{{- if ( has "tungstenfabric" .Values.network.backend ) }}
--config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini
-{{- else if ( has "ovn" .Values.network.backend ) }}
- --config-file /tmp/pod-shared/ml2_conf.ini
{{- else }}
--config-file /etc/neutron/plugins/ml2/ml2_conf.ini
{{- end }}
+{{- if ( has "ovn" .Values.network.backend ) }}
+ --config-file /tmp/pod-shared/ovn.ini
+{{- end }}
{{- if .Values.conf.plugins.taas.taas.enabled }} \
--config-file /etc/neutron/taas_plugin.ini
{{- end }}
diff --git a/charts/neutron/templates/configmap-bin.yaml b/charts/neutron/templates/configmap-bin.yaml
index fa90177..b509721 100644
--- a/charts/neutron/templates/configmap-bin.yaml
+++ b/charts/neutron/templates/configmap-bin.yaml
@@ -98,18 +98,16 @@
neutron-test-force-cleanup.sh: |
{{ tuple "bin/_neutron-test-force-cleanup.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+ neutron-metadata-agent-init.sh: |
+{{ tuple "bin/_neutron-metadata-agent-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- if ( has "ovn" .Values.network.backend ) }}
neutron-ovn-metadata-agent.sh: |
{{ tuple "bin/_neutron-ovn-metadata-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- neutron-ovn-metadata-agent-init.sh: |
-{{ tuple "bin/_neutron-ovn-metadata-agent-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- neutron-server-ovn-init.sh: |
-{{ tuple "bin/_neutron-server-ovn-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
+ neutron-ovn-init.sh: |
+{{ tuple "bin/_neutron-ovn-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- else }}
neutron-metadata-agent.sh: |
{{ tuple "bin/_neutron-metadata-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
- neutron-metadata-agent-init.sh: |
-{{ tuple "bin/_neutron-metadata-agent-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
{{- end }}
{{- if ( has "tungstenfabric" .Values.network.backend ) }}
diff --git a/charts/neutron/templates/configmap-etc.yaml b/charts/neutron/templates/configmap-etc.yaml
index c49b7ff..046c02b 100644
--- a/charts/neutron/templates/configmap-etc.yaml
+++ b/charts/neutron/templates/configmap-etc.yaml
@@ -141,6 +141,16 @@
{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set $envAll.Values.conf.metadata_agent.cache "memcache_servers" -}}
{{- end -}}
+{{- if empty $envAll.Values.conf.ovn_metadata_agent.DEFAULT.nova_metadata_host -}}
+{{- $_ := tuple "compute_metadata" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" | set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_host" -}}
+{{- end -}}
+{{- if empty $envAll.Values.conf.ovn_metadata_agent.cache.memcache_servers -}}
+{{- $_ := tuple "oslo_cache" "internal" "memcache" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | set $envAll.Values.conf.metadata_agent.cache "memcache_servers" -}}
+{{- end -}}
+{{- if empty $envAll.Values.conf.ovn_metadata_agent.DEFAULT.nova_metadata_port -}}
+{{- $_ := tuple "compute_metadata" "internal" "metadata" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set $envAll.Values.conf.metadata_agent.DEFAULT "nova_metadata_port" }}
+{{- end -}}
+
{{- if empty $envAll.Values.conf.neutron.DEFAULT.interface_driver -}}
{{- $_ := set $envAll.Values "__interface_driver" ( list ) }}
{{- if ( has "openvswitch" $envAll.Values.network.backend ) -}}
diff --git a/charts/neutron/templates/daemonset-ovn-metadata-agent.yaml b/charts/neutron/templates/daemonset-ovn-metadata-agent.yaml
index 511eb26..8f8ae34 100644
--- a/charts/neutron/templates/daemonset-ovn-metadata-agent.yaml
+++ b/charts/neutron/templates/daemonset-ovn-metadata-agent.yaml
@@ -90,23 +90,21 @@
{{- end }}
initContainers:
{{ tuple $envAll "pod_dependency" $mounts_neutron_ovn_metadata_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- - name: neutron-ovn-metadata-agent-init
-{{ tuple $envAll "neutron_ovn_metadata" | include "helm-toolkit.snippets.image" | indent 10 }}
-{{ tuple $envAll $envAll.Values.pod.resources.agent.ovn_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-{{ dict "envAll" $envAll "application" "neutron_ovn_metadata_agent" "container" "neutron_ovn_metadata_agent_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+ - name: neutron-metadata-agent-init
+{{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ dict "envAll" $envAll "application" "neutron_metadata_agent" "container" "neutron_metadata_agent_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
env:
- name: NEUTRON_USER_UID
- value: "{{ .Values.pod.security_context.neutron_ovn_metadata_agent.pod.runAsUser }}"
+ value: "{{ .Values.pod.security_context.neutron_metadata_agent.pod.runAsUser }}"
command:
- - /tmp/neutron-ovn-metadata-agent-init.sh
+ - /tmp/neutron-metadata-agent-init.sh
volumeMounts:
- - name: run
- mountPath: /run
- name: pod-tmp
mountPath: /tmp
- name: neutron-bin
- mountPath: /tmp/neutron-ovn-metadata-agent-init.sh
- subPath: neutron-ovn-metadata-agent-init.sh
+ mountPath: /tmp/neutron-metadata-agent-init.sh
+ subPath: neutron-metadata-agent-init.sh
readOnly: true
- name: neutron-etc
mountPath: /etc/neutron/neutron.conf
@@ -114,6 +112,19 @@
readOnly: true
- name: socket
mountPath: /var/lib/neutron/openstack-helm
+ - name: ovn-neutron-init
+{{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ dict "envAll" $envAll "application" "neutron_metadata_agent" "container" "neutron_metadata_agent_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
+ command:
+ - /tmp/neutron-ovn-init.sh
+ volumeMounts:
+ - name: pod-tmp
+ mountPath: /tmp
+ - name: neutron-bin
+ mountPath: /tmp/neutron-ovn-init.sh
+ subPath: neutron-ovn-init.sh
+ readOnly: true
containers:
- name: neutron-ovn-metadata-agent
{{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }}
@@ -234,7 +245,7 @@
{{- $daemonset := "ovn-metadata-agent" }}
{{- $configMapName := "neutron-etc" }}
{{- $serviceAccountName := "neutron-ovn-metadata-agent" }}
-{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "ovn-metadata" -}}
+{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "ovn_metadata" -}}
{{- $_ := include "helm-toolkit.utils.dependency_resolver" $dependencyOpts | toString | fromYaml }}
{{ tuple $envAll "pod_dependency" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "neutron.ovn_metadata_agent.daemonset" | toString | fromYaml }}
diff --git a/charts/neutron/templates/deployment-server.yaml b/charts/neutron/templates/deployment-server.yaml
index 12ca245..630987f 100644
--- a/charts/neutron/templates/deployment-server.yaml
+++ b/charts/neutron/templates/deployment-server.yaml
@@ -95,23 +95,13 @@
- name: ovn-neutron-init
{{ tuple $envAll "neutron_server" | include "helm-toolkit.snippets.image" | indent 10 }}
command:
- - /tmp/neutron-server-ovn-init.sh
+ - /tmp/neutron-ovn-init.sh
volumeMounts:
- - name: pod-tmp
- mountPath: /tmp
- name: pod-shared
mountPath: /tmp/pod-shared
- name: neutron-bin
- mountPath: /tmp/neutron-server-ovn-init.sh
- subPath: neutron-server-ovn-init.sh
- readOnly: true
- - name: neutron-etc
- mountPath: /etc/nginx/nginx.conf
- subPath: nginx.conf
- readOnly: true
- - name: neutron-etc
- mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
- subPath: ml2_conf.ini
+ mountPath: /tmp/neutron-ovn-init.sh
+ subPath: neutron-ovn-init.sh
readOnly: true
{{- end }}
{{- if ( has "tungstenfabric" .Values.network.backend ) }}
diff --git a/charts/neutron/values.yaml b/charts/neutron/values.yaml
index 83968e7..114efa4 100644
--- a/charts/neutron/values.yaml
+++ b/charts/neutron/values.yaml
@@ -286,17 +286,13 @@
- endpoint: public
service: compute_metadata
ovn_metadata:
- pod: null
- jobs:
- - neutron-rabbit-init
+ pod:
+ - requireSameNode: true
+ labels:
+ application: ovn
+ component: ovn-controller
services:
- endpoint: internal
- service: oslo_messaging
- - endpoint: internal
- service: network
- - endpoint: internal
- service: compute
- - endpoint: public
service: compute_metadata
ovs_agent:
jobs:
@@ -1762,6 +1758,9 @@
enable_proxy_headers_parsing: true
oslo_policy:
policy_file: /etc/neutron/policy.yaml
+ ovn:
+ enable_distributed_floating_ip: true
+ ovn_metadata_enabled: true
nova:
auth_type: password
auth_version: v3
@@ -1869,6 +1868,9 @@
# using ml2_type_vlan.network_vlan_ranges:
# ml2_type_vlan:
# network_vlan_ranges: "external:1100:1110"
+ ml2_type_geneve:
+ vni_ranges: 1:65536
+ max_header_size: 38
agent:
extensions: ""
ml2_conf_sriov: null
@@ -1946,7 +1948,18 @@
enabled: true
backend: dogpile.cache.memcached
bagpipe_bgp: {}
- ovn_metadata_agent: {}
+ ovn_metadata_agent:
+ DEFAULT:
+ # we cannot change the proxy socket path as it is declared
+ # as a hostPath volume from agent daemonsets
+ metadata_proxy_socket: /var/lib/neutron/openstack-helm/metadata_proxy
+ metadata_proxy_shared_secret: "password"
+ metadata_workers: 2
+ cache:
+ enabled: true
+ backend: dogpile.cache.memcached
+ ovs:
+ ovsdb_connection: unix:/run/openvswitch/db.sock
rabbitmq:
# NOTE(rk760n): adding rmq policy to mirror messages from notification queues and set expiration time for the ones
diff --git a/hack/sync-charts.sh b/hack/sync-charts.sh
index 54bdb57..0b75cbc 100755
--- a/hack/sync-charts.sh
+++ b/hack/sync-charts.sh
@@ -151,6 +151,13 @@
| filterdiff -p2 -x 'Chart.yaml' \
| filterdiff -p1 -i 'neutron/*' \
| patch -p2 -d ${ATMOSPHERE}/charts/neutron
+curl 'https://review.opendev.org/changes/openstack%2Fopenstack-helm~889258/revisions/3/patch?download' \
+ | base64 --decode \
+ | filterdiff -p1 -x 'releasenotes/*' \
+ | filterdiff -p2 -x 'Chart.yaml' \
+ | filterdiff -p2 -x 'values_overrides/*' \
+ | filterdiff -p1 -i 'neutron/*' \
+ | patch -p2 -d ${ATMOSPHERE}/charts/neutron
NOVA_VERISON=0.3.10
curl -sL https://tarballs.opendev.org/openstack/openstack-helm/nova-${NOVA_VERISON}.tgz \
diff --git a/roles/neutron/vars/main.yml b/roles/neutron/vars/main.yml
index a100837..6352a03 100644
--- a/roles/neutron/vars/main.yml
+++ b/roles/neutron/vars/main.yml
@@ -69,7 +69,6 @@
__neutron_ovn_helm_values:
network:
backend:
- # - openvswitch
- ovn
conf:
neutron:
@@ -77,28 +76,14 @@
service_plugins: qos,ovn-router,segments,trunk
ovn:
dns_servers: "{{ neutron_coredns_cluster_ip | default('10.96.0.20') }}"
- enable_distributed_floating_ip: true
- ovn_metadata_enabled: true
- ovn_nb_connection: "tcp:{{ neutron_ovn_nb_svc.resources[0].spec.clusterIP }}:{{ neutron_ovn_nb_svc.resources[0].spec.ports[0].port }}"
- ovn_sb_connection: "tcp:{{ neutron_ovn_sb_svc.resources[0].spec.clusterIP }}:{{ neutron_ovn_sb_svc.resources[0].spec.ports[0].port }}"
ovn_metadata_agent:
DEFAULT:
- nova_metadata_host: nova-metadata.openstack.svc.cluster.local
metadata_proxy_shared_secret: "{{ openstack_helm_endpoints['compute_metadata']['secret'] }}"
- metadata_workers: 2
- cache:
- enabled: true
- backend: dogpile.cache.memcached
- ovs:
- ovsdb_connection: unix:/run/openvswitch/db.sock
plugins:
ml2_conf:
ml2:
- type_drivers: flat,vlan,vxlan,geneve
+ type_drivers: flat,vlan,geneve
tenant_network_types: geneve
- ml2_type_geneve:
- vni_ranges: 1:65536
- max_header_size: 38
manifests:
daemonset_dhcp_agent: false
daemonset_l3_agent: false