Merge tag '2.15.0+ds1' into debian/victoria

[ovs.git] / lib / netdev-vport.c

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 15567e52445308c920efc417367012ead0c99ad2..499c0291c933f695647b36ef61a8e23f4344d42e 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -767,6 +767,14 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args, char **errp)
                  }
                  tnl_cfg.payload_ethertype = htons(payload_ethertype);
             }
+        } else if (!strcmp(node->key, "remote_cert") ||
+                   !strcmp(node->key, "remote_name") ||
+                   !strcmp(node->key, "psk")) {
+            /* When configuring OVS for IPsec, these keys may be set in the
+               tunnel port's 'options' column. 'ovs-vswitchd' does not directly
+               use them, but they are read by 'ovs-monitor-ipsec'. In order to
+               suppress the "unknown %s argument" warning message below, we
+               handle them here by ignoring them. */
         } else {
             ds_put_format(&errors, "%s: unknown %s argument '%s'\n", name,
                           type, node->key);