diff mbox series

[ovs-dev] vswitchd.conf.db.5: Fix supported IPsec tunnels

Message ID 20210115142909.2643080-1-mark.d.gray@redhat.com
State Accepted
Headers show
Series [ovs-dev] vswitchd.conf.db.5: Fix supported IPsec tunnels | expand

Commit Message

Mark Gray Jan. 15, 2021, 2:29 p.m. UTC
'ovs-monitor-ipsec' does not support 'ip6gre' tunnels.

Fixes: 22c5eafb6efa ("ipsec: reintroduce IPsec support for tunneling")
Signed-off-by: Mark Gray <mark.d.gray@redhat.com>
---
 vswitchd/vswitch.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Ilya Maximets Feb. 1, 2021, 3:52 p.m. UTC | #1
On 1/15/21 3:29 PM, Mark Gray wrote:
> 'ovs-monitor-ipsec' does not support 'ip6gre' tunnels.
> 
> Fixes: 22c5eafb6efa ("ipsec: reintroduce IPsec support for tunneling")
> Signed-off-by: Mark Gray <mark.d.gray@redhat.com>
> ---
>  vswitchd/vswitch.xml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
> index fee54b0fa058..28f89e4052b3 100644
> --- a/vswitchd/vswitch.xml
> +++ b/vswitchd/vswitch.xml
> @@ -3049,8 +3049,8 @@
>        <group title="Tunnel Options: IPsec">
>          <p>
>            Setting any of these options enables IPsec support for a given
> -          tunnel.  <code>gre</code>, <code>ip6gre</code>,
> -          <code>geneve</code>, <code>vxlan</code> and <code>stt</code>
> +          tunnel.  <code>gre</code>, <code>geneve</code>,
> +          <code>vxlan</code> and <code>stt</code>
>            interfaces support these options.  See the <code>IPsec</code>
>            section in the <ref table="Open_vSwitch"/> table for a description
>            of each mode.
> 

Thanks!

Applied to master and backported down to 2.12.

It doesn't apply cleanly to older branches, but it doesn't make
much sense to have it there, I think.

Best regards, Ilya Maximets.
Mark Gray Feb. 2, 2021, 11:19 a.m. UTC | #2
On 01/02/2021 15:52, Ilya Maximets wrote:
> On 1/15/21 3:29 PM, Mark Gray wrote:
>> 'ovs-monitor-ipsec' does not support 'ip6gre' tunnels.
>>
>> Fixes: 22c5eafb6efa ("ipsec: reintroduce IPsec support for tunneling")
>> Signed-off-by: Mark Gray <mark.d.gray@redhat.com>
>> ---
>>  vswitchd/vswitch.xml | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
>> index fee54b0fa058..28f89e4052b3 100644
>> --- a/vswitchd/vswitch.xml
>> +++ b/vswitchd/vswitch.xml
>> @@ -3049,8 +3049,8 @@
>>        <group title="Tunnel Options: IPsec">
>>          <p>
>>            Setting any of these options enables IPsec support for a given
>> -          tunnel.  <code>gre</code>, <code>ip6gre</code>,
>> -          <code>geneve</code>, <code>vxlan</code> and <code>stt</code>
>> +          tunnel.  <code>gre</code>, <code>geneve</code>,
>> +          <code>vxlan</code> and <code>stt</code>
>>            interfaces support these options.  See the <code>IPsec</code>
>>            section in the <ref table="Open_vSwitch"/> table for a description
>>            of each mode.
>>
> 
> Thanks!
> 
> Applied to master and backported down to 2.12.
> 
> It doesn't apply cleanly to older branches, but it doesn't make
> much sense to have it there, I think.

Agreed

Thanks Ilya
> 
> Best regards, Ilya Maximets.
>
diff mbox series

Patch

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index fee54b0fa058..28f89e4052b3 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -3049,8 +3049,8 @@ 
       <group title="Tunnel Options: IPsec">
         <p>
           Setting any of these options enables IPsec support for a given
-          tunnel.  <code>gre</code>, <code>ip6gre</code>,
-          <code>geneve</code>, <code>vxlan</code> and <code>stt</code>
+          tunnel.  <code>gre</code>, <code>geneve</code>,
+          <code>vxlan</code> and <code>stt</code>
           interfaces support these options.  See the <code>IPsec</code>
           section in the <ref table="Open_vSwitch"/> table for a description
           of each mode.