No provision to run a VLAN-only (no GRE, no VxLAN) configuration

[Florian Haas]

This charm currently does not allow forgoing GRE/VxLAN configuration altogether. Specifically in private cloud environments, using VLANs exclusively for segmentation is a perfectly valid use case, and adding overlay networks frequently introduces unnecessary complexity.

Attempted workarounds:

(1) Adding an empty "overlay-network-type:" entry into the configuration dictionary, like so:

neutron-api:
  openstack-origin: cloud:trusty-kilo
  overlay-network-type:
  vlan-ranges: 'physnet1:3000:3999'
  verbose: 'True'

This has overlay-network-type revert to the default of "gre":

grep tenant_network_types /etc/neutron/plugins/ml2/ml2_conf.ini
tenant_network_types = gre,vlan,flat,local

(2) Setting "overlay-network-type" to the empty string:

neutron-api:
  openstack-origin: cloud:trusty-kilo
  overlay-network-type: ''
  vlan-ranges: 'physnet1:3000:3999'
  verbose: 'True'

This creates an invalid tenant_network_types entry that ML2 chokes on:
grep tenant_network_types /etc/neutron/plugins/ml2/ml2_conf.ini
tenant_network_types = ,vlan,flat,local

Expected behavior:

The charm should provide a setting that sets tenant_network_types to just "vlan,flat,local".

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/407023

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/407023
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-api/commit/?id=446de085a097f3aeda977945b2118b60b3f77ae8
Submitter: Jenkins
Branch: master

commit 446de085a097f3aeda977945b2118b60b3f77ae8
Author: Liam Young <email address hidden>
Date: Mon Dec 5 15:08:35 2016 +0000

    Add default-tenant-network-type config option

    - Add default-tenant-network-type config option to allow the default
      network type for a tenant network to be set

    - Fix rendering of overlay-network-type so that an empty string is
      valid

    Change-Id: Ib2325d273a0dd5e637f36113b951130387902777
    Closes-Bug: 1533651

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/16.10
Review: https://review.openstack.org/407540

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/407540
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-api/commit/?id=6abba42cb66212d58b871774e4fe7319c17ee36a
Submitter: Jenkins
Branch: stable/16.10

commit 6abba42cb66212d58b871774e4fe7319c17ee36a
Author: Liam Young <email address hidden>
Date: Mon Dec 5 15:08:35 2016 +0000

    Add default-tenant-network-type config option

    - Add default-tenant-network-type config option to allow the default
      network type for a tenant network to be set

    - Fix rendering of overlay-network-type so that an empty string is
      valid

    - Fix amulet tests to pickup packages in virtual env

    Change-Id: Ib2325d273a0dd5e637f36113b951130387902777
    Closes-Bug: 1533651
    (cherry picked from commit 446de085a097f3aeda977945b2118b60b3f77ae8)

[James Page (james-page)]

Marking Fix Released as backport to most recent stable branch is complete.

[Florian Haas (fghaas)]

Thanks everyone, that's a really helpful fix!

[Firl (celpa-firl)]

How can I test this?