liberty->mitaka upgrade completes, but neutron-openvswitch-agent unconfigured

[James Page]

Using the charm to upgrade from liberty->mitaka completes the package upgrade OK, but the upgrade process fails to take into account the switch in the ovs-agent from using ml2_conf.ini to openvswitch_agent.ini.

As a workaround, you can remove and re-add the relation between n-gateway and n-api; however the do_openstack_upgrade function should just dtrt.

[James Page (james-page)]

Login in resolve_configs:

    if plugin == OVS:
        # NOTE: deal with switch to ML2 plugin for >= icehouse
        drop_config = [NEUTRON_OVS_AGENT_CONF]
        if release >= 'mitaka':
            # ml2 -> ovs_agent
            drop_config = [NEUTRON_ML2_PLUGIN_CONF]

[James Page (james-page)]

https://review.openstack.org/508111

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/508111
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-gateway/commit/?id=86bd7da4dbce707912b4057af1c9d8aca5b2bd15
Submitter: Zuul
Branch: master

commit 86bd7da4dbce707912b4057af1c9d8aca5b2bd15
Author: James Page <email address hidden>
Date: Thu Sep 28 11:58:14 2017 +0100

    Fix upgrades from Liberty to Mitaka

    Ensure that any new configuration files are written to disk
    prior to performing the package upgrade between OpenStack
    releases; this ensures that the new versions of the daemons
    start with the correct configuration from initial start on
    package post installation configuration.

    Change-Id: Ie5f3757e6c3d11fbb2d201b1f7a28e274a5f03e4
    Closes-Bug: 1634923

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/17.08
Review: https://review.openstack.org/508890

[James Page (james-page)]

neutron-openvswitch is not actually impacted in the same way due to the subordinate nature of the upgrade process.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/508890
Committed: https://git.openstack.org/cgit/openstack/charm-neutron-gateway/commit/?id=90d13fc47532ca55fa4356207633ccaaa4108417
Submitter: Jenkins
Branch: stable/17.08

commit 90d13fc47532ca55fa4356207633ccaaa4108417
Author: James Page <email address hidden>
Date: Thu Sep 28 11:58:14 2017 +0100

    Fix upgrades from Liberty to Mitaka

    Ensure that any new configuration files are written to disk
    prior to performing the package upgrade between OpenStack
    releases; this ensures that the new versions of the daemons
    start with the correct configuration from initial start on
    package post installation configuration.

    Change-Id: Ie5f3757e6c3d11fbb2d201b1f7a28e274a5f03e4
    Closes-Bug: 1634923
    (cherry picked from commit 86bd7da4dbce707912b4057af1c9d8aca5b2bd15)