From 186b03d72098858c9d8f1b0b014527ffe9864d72 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Mon, 9 Apr 2018 14:54:48 -0400
Subject: [PATCH] Fix missing allowed network type 'flat' for ODL OVS
The 'flat' network type was missing from the default allowed network
types with OpenDaylight deployments. This is OVS configuration which
detemrines which tenant network types are supported on a per node basis.
By default, flat should be allowed.
Closes-Bug: 1762495
Change-Id: Idf626948ee46a88f95f020fc12b7cd8b04db8be6
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
puppet/services/opendaylight-ovs.yaml | 4 ++--
.../fix-odl-ovs-allowed-network-types-d196d6d40fadb1bc.yaml | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 releasenotes/notes/fix-odl-ovs-allowed-network-types-d196d6d40fadb1bc.yaml
diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
index 330f936b28..72622149d7 100644
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -40,7 +40,7 @@ parameters:
vary per host or role to constrain which hosts nova instances
and networks are scheduled to.
type: comma_delimited_list
- default: ['local', 'vlan', 'vxlan', 'gre']
+ default: ['local', 'flat', 'vlan', 'vxlan', 'gre']
tags:
- role_specific
OvsEnableDpdk:
@@ -323,4 +323,4 @@ outputs:
- service: ovs
network: {get_param: [ServiceNetMap, OpendaylightApiNetwork]}
type: node
- - null
\ No newline at end of file
+ - null
diff --git a/releasenotes/notes/fix-odl-ovs-allowed-network-types-d196d6d40fadb1bc.yaml b/releasenotes/notes/fix-odl-ovs-allowed-network-types-d196d6d40fadb1bc.yaml
new file mode 100644
index 0000000000..1bec4b2240
--- /dev/null
+++ b/releasenotes/notes/fix-odl-ovs-allowed-network-types-d196d6d40fadb1bc.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Fixes missing type "flat" from the default allowed network types for
+ the ODL OVS parameter HostAllowedNetworkTypes. See
+ https://bugs.launchpad.net/tripleo/+bug/1762495