From 93876fa6b78f4243f99e1ed839cd93257eb94ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagn=C3=A9?= Date: Tue, 24 Feb 2026 13:54:31 -0500 Subject: [PATCH] Remove support for tungstenfabric MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8918e54b63b3050ac56a307778ae47f860b2e7b5 Signed-off-by: Mathieu Gagné --- doc/source/devref/networking.rst | 7 +- neutron/templates/bin/_db-sync.sh.tpl | 4 - .../templates/bin/_neutron-ovn-db-sync.sh.tpl | 4 - .../templates/bin/_neutron-rpc-server.sh.tpl | 4 - neutron/templates/bin/_neutron-server.sh.tpl | 4 - neutron/templates/configmap-bin.yaml | 5 -- neutron/templates/configmap-etc.yaml | 26 ------- neutron/templates/cron-job-ovn-db-sync.yaml | 29 ------- neutron/templates/deployment-rpc_server.yaml | 43 ---------- neutron/templates/deployment-server.yaml | 43 ---------- neutron/values.yaml | 2 +- nova/templates/configmap-bin.yaml | 4 - nova/templates/daemonset-compute.yaml | 39 ---------- nova/values.yaml | 3 - .../notes/neutron-d39cc4643edac73c.yaml | 5 ++ releasenotes/notes/nova-2c10ffbcf8d2f838.yaml | 5 ++ values_overrides/neutron/bagpipe_bgp.yaml | 2 - values_overrides/neutron/tf.yaml | 73 ----------------- values_overrides/nova/tf.yaml | 78 ------------------- 19 files changed, 14 insertions(+), 366 deletions(-) create mode 100644 releasenotes/notes/neutron-d39cc4643edac73c.yaml create mode 100644 releasenotes/notes/nova-2c10ffbcf8d2f838.yaml delete mode 100644 values_overrides/neutron/tf.yaml delete mode 100644 values_overrides/nova/tf.yaml diff --git a/doc/source/devref/networking.rst b/doc/source/devref/networking.rst index b0199a0e79..e20827ffc5 100644 --- a/doc/source/devref/networking.rst +++ b/doc/source/devref/networking.rst @@ -105,15 +105,14 @@ The above configuration options are handled by ``neutron/values.yaml``: ... # core_plugin can be: ml2, calico core_plugin: ml2 - # service_plugin can be: router, odl-router, empty for calico, + # service_plugin can be: router, empty for calico, # networking_ovn.l3.l3_ovn.OVNL3RouterPlugin for OVN service_plugins: router plugins: ml2_conf: ml2: - # mechnism_drivers can be: openvswitch, linuxbridge, - # opendaylight, ovn + # mechnism_drivers can be: openvswitch, linuxbridge, ovn mechanism_drivers: openvswitch,l2population type_drivers: flat,vlan,vxlan @@ -297,7 +296,7 @@ openvswitch-db and openvswitch-vswitchd +++++++++++++++++++++++++++++++++++++++ This runs the OVS tool and database. OpenVSwitch chart is not Neutron specific, it may be used with other technologies that are leveraging the OVS technology, -such as OVN or ODL. +such as OVN. A detail worth mentioning is that ovs is configured to use sockets, rather than the default loopback mechanism. diff --git a/neutron/templates/bin/_db-sync.sh.tpl b/neutron/templates/bin/_db-sync.sh.tpl index 13550b601c..eb2558ace3 100644 --- a/neutron/templates/bin/_db-sync.sh.tpl +++ b/neutron/templates/bin/_db-sync.sh.tpl @@ -18,11 +18,7 @@ set -ex neutron-db-manage \ --config-file /etc/neutron/neutron.conf \ -{{- if ( has "tungstenfabric" .Values.network.backend ) }} - --config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini \ -{{- else }} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ -{{- end }} --config-dir /etc/neutron/neutron.conf.d \ upgrade head diff --git a/neutron/templates/bin/_neutron-ovn-db-sync.sh.tpl b/neutron/templates/bin/_neutron-ovn-db-sync.sh.tpl index f945ebdd8c..918375a482 100644 --- a/neutron/templates/bin/_neutron-ovn-db-sync.sh.tpl +++ b/neutron/templates/bin/_neutron-ovn-db-sync.sh.tpl @@ -30,9 +30,5 @@ neutron-ovn-db-sync-util \ {{- if .Values.conf.plugins.l2gateway }} --config-file /etc/neutron/l2gw_plugin.ini \ {{- end }} -{{- if ( has "tungstenfabric" .Values.network.backend ) }} - --config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini \ -{{- else }} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ -{{- end }} --ovn-neutron_sync_mode "$1" diff --git a/neutron/templates/bin/_neutron-rpc-server.sh.tpl b/neutron/templates/bin/_neutron-rpc-server.sh.tpl index f7a90a44e0..fdbe695178 100644 --- a/neutron/templates/bin/_neutron-rpc-server.sh.tpl +++ b/neutron/templates/bin/_neutron-rpc-server.sh.tpl @@ -32,11 +32,7 @@ function start () { {{- if .Values.conf.plugins.l2gateway }} --config-file /etc/neutron/l2gw_plugin.ini \ {{- end }} -{{- if ( has "tungstenfabric" .Values.network.backend ) }} - --config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini \ -{{- else }} --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ -{{- end }} --config-dir /etc/neutron/neutron.conf.d } diff --git a/neutron/templates/bin/_neutron-server.sh.tpl b/neutron/templates/bin/_neutron-server.sh.tpl index 2a460de5fa..129bac40fb 100644 --- a/neutron/templates/bin/_neutron-server.sh.tpl +++ b/neutron/templates/bin/_neutron-server.sh.tpl @@ -37,11 +37,7 @@ function start () { {{- if .Values.conf.plugins.l2gateway }} confs+=" --config-file /etc/neutron/l2gw_plugin.ini" {{- end }} -{{- if ( has "tungstenfabric" .Values.network.backend ) }} - confs+=" --config-file /etc/neutron/plugins/tungstenfabric/tf_plugin.ini" -{{- else }} confs+=" --config-file /etc/neutron/plugins/ml2/ml2_conf.ini" -{{- end }} confs+=" --config-dir /etc/neutron/neutron.conf.d" exec uwsgi --ini /etc/neutron/neutron-api-uwsgi.ini --pyargv " $confs " diff --git a/neutron/templates/configmap-bin.yaml b/neutron/templates/configmap-bin.yaml index 3815e85b87..f2c0fe6c3d 100644 --- a/neutron/templates/configmap-bin.yaml +++ b/neutron/templates/configmap-bin.yaml @@ -121,9 +121,4 @@ data: neutron-metadata-agent.sh: | {{ tuple "bin/_neutron-metadata-agent.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} {{- end }} - -{{- if ( has "tungstenfabric" .Values.network.backend ) }} - tf-plugin.pth: | - /opt/plugin/site-packages -{{- end }} {{- end }} diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml index ddbf3deff1..778bc79bff 100644 --- a/neutron/templates/configmap-etc.yaml +++ b/neutron/templates/configmap-etc.yaml @@ -180,30 +180,6 @@ limitations under the License. {{- end }} {{- end -}} -{{- if ( has "tungstenfabric" .Values.network.backend ) -}} -{{- if empty .Values.conf.plugins.tungstenfabric.KEYSTONE.auth_url -}} -{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.plugins.tungstenfabric.KEYSTONE "auth_url" -}} -{{- end -}} -{{- if empty .Values.conf.plugins.tungstenfabric.KEYSTONE.admin_user -}} -{{- $_ := set .Values.conf.plugins.tungstenfabric.KEYSTONE "admin_user" .Values.endpoints.identity.auth.admin.username -}} -{{- end -}} -{{- if empty .Values.conf.plugins.tungstenfabric.KEYSTONE.admin_password -}} -{{- $_ := set .Values.conf.plugins.tungstenfabric.KEYSTONE "admin_password" .Values.endpoints.identity.auth.admin.password -}} -{{- end -}} -{{- if empty .Values.conf.plugins.tungstenfabric.KEYSTONE.admin_tenant_name -}} -{{- $_ := set .Values.conf.plugins.tungstenfabric.KEYSTONE "admin_tenant_name" .Values.endpoints.identity.auth.admin.project_name -}} -{{- end -}} -{{- if empty .Values.conf.plugins.tf_vnc_api_lib.auth.AUTHN_SERVER -}} -{{- $_ := tuple "identity" . | include "helm-toolkit.endpoints.keystone_endpoint_name_lookup" | set .Values.conf.plugins.tf_vnc_api_lib.auth "AUTHN_SERVER" -}} -{{- end -}} -{{- if empty .Values.conf.plugins.tf_vnc_api_lib.auth.AUTHN_PORT -}} -{{- $_ := tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.plugins.tf_vnc_api_lib.auth "AUTHN_PORT" -}} -{{- end -}} -{{- if empty .Values.conf.plugins.tf_vnc_api_lib.auth.AUTHN_DOMAIN -}} -{{- $_ := set .Values.conf.plugins.tf_vnc_api_lib.auth "AUTHN_DOMAIN" .Values.endpoints.identity.auth.neutron.project_domain_name -}} -{{- end -}} -{{- end -}} - --- apiVersion: v1 kind: Secret @@ -233,8 +209,6 @@ data: l2gw_agent.ini: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" .Values.conf.l2gateway_agent | b64enc) }} bagpipe_bgp.conf: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" .Values.conf.bagpipe_bgp | b64enc) }} bgp_dragent.ini: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" .Values.conf.bgp_dragent | b64enc) }} - tf_plugin.ini: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.tungstenfabric | b64enc) }} - vnc_api_lib.ini: {{ default "\"\"" (include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.tf_vnc_api_lib | b64enc) }} dnsmasq.conf: "{{ $envAll.Values.conf.dnsmasq | b64enc }}" neutron_sudoers: {{ $envAll.Values.conf.neutron_sudoers | b64enc }} rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }} diff --git a/neutron/templates/cron-job-ovn-db-sync.yaml b/neutron/templates/cron-job-ovn-db-sync.yaml index fbe21231c3..cf78010749 100644 --- a/neutron/templates/cron-job-ovn-db-sync.yaml +++ b/neutron/templates/cron-job-ovn-db-sync.yaml @@ -106,35 +106,10 @@ spec: - name: neutron-etc-snippets mountPath: /etc/neutron/neutron.conf.d/ readOnly: true - {{- if( has "tungstenfabric" .Values.network.backend ) }} - - name: neutron-etc - mountPath: /etc/neutron/plugins/tungstenfabric/tf_plugin.ini - subPath: tf_plugin.ini - readOnly: true - - name: neutron-etc - mountPath: /etc/contrail/vnc_api_lib.ini - subPath: vnc_api_lib.ini - readOnly: true - - name: neutron-plugin-shared - mountPath: /opt/plugin - - name: neutron-bin - mountPath: /usr/local/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: neutron-bin - mountPath: /var/lib/openstack/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: neutron-bin - mountPath: /var/lib/openstack/lib/python3.6/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - {{- else }} - name: neutron-etc mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini subPath: ml2_conf.ini readOnly: true - {{- end }} {{ if ( has "sriov" .Values.network.backend ) }} - name: neutron-etc mountPath: /etc/neutron/plugins/ml2/sriov_agent.ini @@ -184,10 +159,6 @@ spec: {{- else }} emptyDir: {} {{ end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: neutron-plugin-shared - emptyDir: {} - {{- end }} {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 12 }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.network.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 12 }} {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 12 }} diff --git a/neutron/templates/deployment-rpc_server.yaml b/neutron/templates/deployment-rpc_server.yaml index 904787a3e5..7444ae7798 100644 --- a/neutron/templates/deployment-rpc_server.yaml +++ b/neutron/templates/deployment-rpc_server.yaml @@ -79,20 +79,6 @@ spec: subPath: neutron-ovn-init.sh readOnly: true {{- end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: tungstenfabric-neutron-init - image: {{ .Values.images.tags.tf_neutron_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.pod.resources.rpc_server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - securityContext: - runAsUser: {{ .Values.pod.security_context.neutron_rpc_server.pod.runAsUser }} - env: - - name: OPENSTACK_VERSION - value: "{{ .Values.conf.openstack_version }}" - volumeMounts: - - name: neutron-plugin-shared - mountPath: /opt/plugin - {{- end }} containers: - name: neutron-rpc-server {{ tuple $envAll "neutron_rpc_server" | include "helm-toolkit.snippets.image" | indent 10 }} @@ -149,35 +135,10 @@ spec: mountPath: /etc/neutron/api_audit_map.conf subPath: api_audit_map.conf readOnly: true - {{- if( has "tungstenfabric" .Values.network.backend ) }} - - name: neutron-etc - mountPath: /etc/neutron/plugins/tungstenfabric/tf_plugin.ini - subPath: tf_plugin.ini - readOnly: true - - name: neutron-etc - mountPath: /etc/contrail/vnc_api_lib.ini - subPath: vnc_api_lib.ini - readOnly: true - - name: neutron-plugin-shared - mountPath: /opt/plugin - - name: neutron-bin - mountPath: /usr/local/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: neutron-bin - mountPath: /var/lib/openstack/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: neutron-bin - mountPath: /var/lib/openstack/lib/python3.6/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - {{- else }} - name: neutron-etc mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini subPath: ml2_conf.ini readOnly: true - {{- end }} {{ if ( has "sriov" .Values.network.backend ) }} - name: neutron-etc mountPath: /etc/neutron/plugins/ml2/sriov_agent.ini @@ -237,10 +198,6 @@ spec: {{- else }} emptyDir: {} {{ end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: neutron-plugin-shared - emptyDir: {} - {{- end }} {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.network.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index 361024a91e..c71a2f9557 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -115,20 +115,6 @@ spec: subPath: neutron-ovn-init.sh readOnly: true {{- end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: tungstenfabric-neutron-init - image: {{ .Values.images.tags.tf_neutron_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - securityContext: - runAsUser: {{ .Values.pod.security_context.neutron_server.pod.runAsUser }} - env: - - name: OPENSTACK_VERSION - value: "{{ .Values.conf.openstack_version }}" - volumeMounts: - - name: neutron-plugin-shared - mountPath: /opt/plugin - {{- end }} containers: {{- if $envAll.Values.manifests.certificates }} - name: nginx @@ -233,35 +219,10 @@ spec: mountPath: /etc/neutron/api_audit_map.conf subPath: api_audit_map.conf readOnly: true - {{- if( has "tungstenfabric" .Values.network.backend ) }} - - name: neutron-etc - mountPath: /etc/neutron/plugins/tungstenfabric/tf_plugin.ini - subPath: tf_plugin.ini - readOnly: true - - name: neutron-etc - mountPath: /etc/contrail/vnc_api_lib.ini - subPath: vnc_api_lib.ini - readOnly: true - - name: neutron-plugin-shared - mountPath: /opt/plugin - - name: neutron-bin - mountPath: /usr/local/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: neutron-bin - mountPath: /var/lib/openstack/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: neutron-bin - mountPath: /var/lib/openstack/lib/python3.6/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - {{- else }} - name: neutron-etc mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini subPath: ml2_conf.ini readOnly: true - {{- end }} {{ if ( has "sriov" .Values.network.backend ) }} - name: neutron-etc mountPath: /etc/neutron/plugins/ml2/sriov_agent.ini @@ -333,10 +294,6 @@ spec: {{- else }} emptyDir: {} {{ end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: neutron-plugin-shared - emptyDir: {} - {{- end }} {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.network.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} diff --git a/neutron/values.yaml b/neutron/values.yaml index d40e05ff79..e6669f2f94 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -1969,7 +1969,7 @@ conf: state_path: /var/lib/neutron # core_plugin can be: ml2, calico core_plugin: ml2 - # service_plugin can be: router, odl-router, empty for calico, + # service_plugin can be: router, empty for calico, # networking_ovn.l3.l3_ovn.OVNL3RouterPlugin for OVN service_plugins: router allow_automatic_l3agent_failover: True diff --git a/nova/templates/configmap-bin.yaml b/nova/templates/configmap-bin.yaml index 564c230949..e7f4ffd1d1 100644 --- a/nova/templates/configmap-bin.yaml +++ b/nova/templates/configmap-bin.yaml @@ -105,8 +105,4 @@ data: {{- include "helm-toolkit.scripts.rabbit_init" . | indent 4 }} wait-for-computes-init.sh: | {{ tuple "bin/_wait-for-computes-init.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} -{{- if ( has "tungstenfabric" .Values.network.backend ) }} - tf-plugin.pth: | - /opt/plugin/site-packages -{{- end }} {{- end }} diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index d59a9dc6aa..43dc9c3f07 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -262,19 +262,6 @@ spec: mountPath: /tmp/pod-shared {{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }} {{ end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: tungstenfabric-compute-init - image: {{ .Values.images.tags.tf_compute_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} -{{ dict "envAll" $envAll "application" "nova" "container" "tungstenfabric_compute_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} - volumeMounts: - - name: tf-plugin-shared - mountPath: /opt/plugin - - name: tf-plugin-bin - mountPath: /opt/plugin/bin -{{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }} - {{- end }} {{- if .Values.network.ssh.enabled }} - name: nova-compute-ssh-init {{ tuple $envAll "nova_compute_ssh" | include "helm-toolkit.snippets.image" | indent 10 }} @@ -464,26 +451,6 @@ spec: mountPropagation: HostToContainer {{- end }} {{- end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: tf-plugin-shared - mountPath: /opt/plugin - readOnly: true - - name: tf-plugin-bin - mountPath: /usr/sbin - readOnly: true - - name: nova-bin - mountPath: /usr/local/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: nova-bin - mountPath: /var/lib/openstack/lib/python2.7/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - - name: nova-bin - mountPath: /var/lib/openstack/lib/python3.6/site-packages/tf-plugin.pth - subPath: tf-plugin.pth - readOnly: true - {{- end }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.compute.osapi.internal "path" "/etc/nova/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal "path" "/etc/rabbitmq/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} {{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }} @@ -603,12 +570,6 @@ spec: path: /sys/block {{- end }} - {{- if ( has "tungstenfabric" .Values.network.backend ) }} - - name: tf-plugin-shared - emptyDir: {} - - name: tf-plugin-bin - emptyDir: {} - {{- end }} {{- dict "enabled" (or .Values.manifests.certificates .Values.tls.identity) "name" .Values.secrets.tls.compute.osapi.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }} {{ if $mounts_nova_compute.volumes }}{{ toYaml $mounts_nova_compute.volumes | indent 8 }}{{ end }} diff --git a/nova/values.yaml b/nova/values.yaml index bff804c78e..5f38df5966 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -2260,9 +2260,6 @@ pod: nova_compute_init: readOnlyRootFilesystem: true runAsUser: 0 - tungstenfabric_compute_init: - readOnlyRootFilesystem: true - allowPrivilegeEscalation: false ceph_perms: readOnlyRootFilesystem: true runAsUser: 0 diff --git a/releasenotes/notes/neutron-d39cc4643edac73c.yaml b/releasenotes/notes/neutron-d39cc4643edac73c.yaml new file mode 100644 index 0000000000..494d4065b5 --- /dev/null +++ b/releasenotes/notes/neutron-d39cc4643edac73c.yaml @@ -0,0 +1,5 @@ +--- +neutron: + - | + Support for tungstenfabric has been removed. +... diff --git a/releasenotes/notes/nova-2c10ffbcf8d2f838.yaml b/releasenotes/notes/nova-2c10ffbcf8d2f838.yaml new file mode 100644 index 0000000000..9db43e8122 --- /dev/null +++ b/releasenotes/notes/nova-2c10ffbcf8d2f838.yaml @@ -0,0 +1,5 @@ +--- +nova: + - | + Support for tungstenfabric has been removed. +... diff --git a/values_overrides/neutron/bagpipe_bgp.yaml b/values_overrides/neutron/bagpipe_bgp.yaml index 29132dcfe3..7b97b925a3 100644 --- a/values_overrides/neutron/bagpipe_bgp.yaml +++ b/values_overrides/neutron/bagpipe_bgp.yaml @@ -4,8 +4,6 @@ conf: DEFAULT: service_plugins: router, bgpvpn service_providers: - # BGPVPN:OpenContrail:networking_bgpvpn.neutron.services.service_drivers.opencontrail.opencontrail.OpenContrailBGPVPNDriver:default - # BGPVPN:OpenDaylight:networking_odl.bgpvpn.odl_v2.OpenDaylightBgpvpnDriver:default service_provider: BGPVPN:BaGPipe:networking_bgpvpn.neutron.services.service_drivers.bagpipe.bagpipe_v2.BaGPipeBGPVPNDriver:default plugins: openvswitch_agent: diff --git a/values_overrides/neutron/tf.yaml b/values_overrides/neutron/tf.yaml deleted file mode 100644 index a4a86cce6f..0000000000 --- a/values_overrides/neutron/tf.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -images: - tags: - tf_neutron_init: opencontrailnightly/contrail-openstack-neutron-init:master-latest -labels: - job: - node_selector_key: openstack-control-plane - node_selector_value: enabled - server: - node_selector_key: openstack-control-plane - node_selector_value: enabled - rpc_server: - node_selector_key: openstack-control-plane - node_selector_value: enabled - test: - node_selector_key: openstack-control-plane - node_selector_value: enabled -network: - backend: - - tungstenfabric -dependencies: - dynamic: - targeted: - tungstenfabric: - server: - daemonset: [] -conf: - openstack_version: queens - neutron: - DEFAULT: - core_plugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2 - service_plugins: neutron_plugin_contrail.plugins.opencontrail.loadbalancer.v2.plugin.LoadBalancerPluginV2 - l3_ha: False - api_extensions_path: /opt/plugin/site-packages/neutron_plugin_contrail/extensions:/opt/plugin/site-packages/neutron_lbaas/extensions - interface_driver: null - quotas: - quota_driver: neutron_plugin_contrail.plugins.opencontrail.quota.driver.QuotaDriver - plugins: - tungstenfabric: - APISERVER: - api_server_ip: config-api-server.tungsten-fabric.svc.cluster.local - api_server_port: 8082 - contrail_extensions: "ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam,policy:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_policy.NeutronPluginContrailPolicy,route-table:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_vpc.NeutronPluginContrailVpc,contrail:None,service-interface:None,vf-binding:None" - multi_tenancy: True - KEYSTONE: - insecure: True - tf_vnc_api_lib: - global: - WEB_SERVER: config-api-server.tungsten-fabric.svc.cluster.local - WEB_PORT: 8082 - auth: - AUTHN_TYPE: keystone - AUTHN_PROTOCOL: http - AUTHN_URL: /v3/auth/tokens -manifests: - daemonset_dhcp_agent: false - daemonset_l3_agent: false - daemonset_lb_agent: false - daemonset_metadata_agent: false - daemonset_ovs_agent: false - daemonset_sriov_agent: false - pod_rally_test: false -pod: - mounts: - neutron_db_sync: - neutron_db_sync: - volumeMounts: - - name: db-sync-conf - mountPath: /etc/neutron/plugins/tungstenfabric/tf_plugin.ini - subPath: tf_plugin.ini - readOnly: true - volumes: -... diff --git a/values_overrides/nova/tf.yaml b/values_overrides/nova/tf.yaml deleted file mode 100644 index 1bd311c719..0000000000 --- a/values_overrides/nova/tf.yaml +++ /dev/null @@ -1,78 +0,0 @@ ---- -images: - tags: - tf_compute_init: opencontrailnightly/contrail-openstack-compute-init:master-latest -conf: - nova: - libvirt: - virt_type: qemu - cpu_mode: host-model - agent: - compute: - node_selector_key: openstack-compute-node - node_selector_value: enabled - compute_ironic: - node_selector_key: openstack-compute-node - node_selector_value: enabled - api_metadata: - node_selector_key: openstack-control-plane - node_selector_value: enabled - conductor: - node_selector_key: openstack-control-plane - node_selector_value: enabled - job: - node_selector_key: openstack-control-plane - node_selector_value: enabled - novncproxy: - node_selector_key: openstack-control-plane - node_selector_value: enabled - osapi: - node_selector_key: openstack-control-plane - node_selector_value: enabled - scheduler: - node_selector_key: openstack-control-plane - node_selector_value: enabled - spiceproxy: - node_selector_key: openstack-control-plane - node_selector_value: enabled - test: - node_selector_key: openstack-control-plane - node_selector_value: enabled - rootwrap: | - # Configuration for nova-rootwrap - # This file should be owned by (and only-writeable by) the root user - - [DEFAULT] - # List of directories to load filter definitions from (separated by ','). - # These directories MUST all be only writeable by root ! - filters_path=/etc/nova/rootwrap.d,/usr/share/nova/rootwrap - - # List of directories to search executables in, in case filters do not - # explicitely specify a full path (separated by ',') - # If not specified, defaults to system PATH environment variable. - # These directories MUST all be only writeable by root ! - exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin,/var/lib/openstack/bin,/var/lib/kolla/venv/bin,/opt/plugin/bin - - # Enable logging to syslog - # Default value is False - use_syslog=False - - # Which syslog facility to use. - # Valid values include auth, authpriv, syslog, local0, local1... - # Default value is 'syslog' - syslog_log_facility=syslog - - # Which messages to log. - # INFO means log all usage - # ERROR means only log unsuccessful attempts - syslog_log_level=ERROR -network: - backend: - - tungstenfabric -dependencies: - dynamic: - targeted: - tungstenfabric: - compute: - daemonset: [] -...