From 4e6bb6febc4ff730fa82cca329c9218c708f7ecc Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Mon, 22 May 2017 16:33:14 +0800 Subject: [PATCH] Sync support network type for provider network Now heat only supports 'vlan' and 'flat' network type for OS::Neutron::ProviderNet, this will add all other supported network types: 'vxlan', 'local', 'gre' and 'geneve'. Change-Id: If7cb4fbc83f5aa62a0b73e003ff23ec2b40b2ded Closes-Bug: #1692445 --- heat/engine/resources/openstack/neutron/provider_net.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/heat/engine/resources/openstack/neutron/provider_net.py b/heat/engine/resources/openstack/neutron/provider_net.py index b19810eda9..6b51a9d427 100644 --- a/heat/engine/resources/openstack/neutron/provider_net.py +++ b/heat/engine/resources/openstack/neutron/provider_net.py @@ -51,6 +51,12 @@ class ProviderNet(net.Net): 'status', 'subnets', ) + NETWORK_TYPES = ( + LOCAL, VLAN, VXLAN, GRE, GENEVE, FLAT + ) = ( + 'local', 'vlan', 'vxlan', 'gre', 'geneve', 'flat' + ) + properties_schema = { NAME: net.Net.properties_schema[NAME], PROVIDER_NETWORK_TYPE: properties.Schema( @@ -60,7 +66,7 @@ class ProviderNet(net.Net): update_allowed=True, required=True, constraints=[ - constraints.AllowedValues(['vlan', 'flat']), + constraints.AllowedValues(NETWORK_TYPES), ] ), PROVIDER_PHYSICAL_NETWORK: properties.Schema(