Merge "Update neutron helm override to enable network_segment_ranges" into f/stein

sysinv/sysinv/centos/build_srpm.data

@@ -1,2 +1,2 @@
 SRC_DIR="sysinv"
-TIS_PATCH_VER=300
+TIS_PATCH_VER=301

sysinv/sysinv/sysinv/sysinv/common/constants.py

@@ -1015,6 +1015,9 @@ SERVICE_PARAM_NETWORK_ML2_EXT_DRIVERS = \
 SERVICE_PARAM_NETWORK_ML2_TENANT_TYPES = \
     ['vlan', 'vxlan']
 
+# service plugin for neutron network segment range feature
+NEUTRON_PLUGIN_NETWORK_SEGMENT_RANGE = 'network_segment_range'
+
 # a subset of Neutron service plugins that are supported
 SERVICE_PARAM_NETWORK_DEFAULT_SERVICE_PLUGINS = \
     ['odl-router',
@@ -1023,7 +1026,8 @@ SERVICE_PARAM_NETWORK_DEFAULT_SERVICE_PLUGINS = \
      'networking_odl.l3.l3_odl_v2:OpenDaylightL3RouterPlugin',
      'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin',
      'networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin',
-     'router']
+     'router',
+     NEUTRON_PLUGIN_NETWORK_SEGMENT_RANGE]
 
 # Neutron service plugins for SDN
 SERVICE_PLUGINS_SDN = \

sysinv/sysinv/sysinv/sysinv/helm/neutron.py

@@ -282,7 +282,8 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
                 'lock_path': '/var/run/neutron/lock',
                 'log_format': '[%(name)s] %(message)s',
                 'policy_file': '/etc/neutron/policy.json',
-                'service_plugins': 'router',
+                'service_plugins':
+                    'router' + ',' + constants.NEUTRON_PLUGIN_NETWORK_SEGMENT_RANGE,
                 'dns_domain': 'openstacklocal',
                 'enable_new_agents': False,
                 'allow_automatic_dhcp_failover': True,
@@ -320,6 +321,10 @@ class NeutronHelm(openstack.OpenstackBaseHelm):
             'securitygroup': {
                 'firewall_driver': 'noop',
             },
+            'ml2_type_vxlan': {
+                'vni_ranges': '',
+                'vxlan_group': '',
+            },
         }
         LOG.info("_get_neutron_ml2_config=%s" % ml2_config)
         return ml2_config