On upgrade neutron-api sends the wrong source info to determine_pacakges

[David Ames]

On upgrade the wrong source infomration is sent to determine_packages with the following

2017-09-06 17:02:31 DEBUG config-changed Traceback (most recent call last):
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/config-changed", line 725, in <module>
2017-09-06 17:02:31 DEBUG config-changed main()
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/config-changed", line 718, in main
2017-09-06 17:02:31 DEBUG config-changed hooks.execute(sys.argv)
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/charmhelpers/core/hookenv.py", line 768, in execute
2017-09-06 17:02:31 DEBUG config-changed self._hooks[hook_name]()
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/charmhelpers/contrib/openstack/utils.py", line 1887, in wrapped_f
2017-09-06 17:02:31 DEBUG config-changed restart_functions)
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/charmhelpers/core/host.py", line 685, in restart_on_change_helper
2017-09-06 17:02:31 DEBUG config-changed r = lambda_f()
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/charmhelpers/contrib/openstack/utils.py", line 1886, in <lambda>
2017-09-06 17:02:31 DEBUG config-changed (lambda: f(*args, **kwargs)), restart_map, stopstart,
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/charmhelpers/contrib/hardening/harden.py", line 79, in _harden_inner2
2017-09-06 17:02:31 DEBUG config-changed return f(*args, **kwargs)
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/config-changed", line 281, in config_changed
2017-09-06 17:02:31 DEBUG config-changed do_openstack_upgrade(CONFIGS)
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/neutron_api_utils.py", line 562, in do_openstack_upgrade
2017-09-06 17:02:31 DEBUG config-changed pkgs = determine_packages(new_os_rel)
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/neutron_api_utils.py", line 417, in determine_packages
2017-09-06 17:02:31 DEBUG config-changed if CompareOpenStackReleases(release) >= 'kilo':
2017-09-06 17:02:31 DEBUG config-changed File "/var/lib/juju/agents/unit-neutron-api-0/charm/hooks/charmhelpers/core/strutils.py", line 89, in __init__
2017-09-06 17:02:31 DEBUG config-changed .format(item, self._list))
2017-09-06 17:02:31 DEBUG config-changed KeyError: "Item 'None' is not in list '('diablo', 'essex', 'folsom', 'grizzly', 'havana', 'icehouse', 'juno', 'kilo', 'liberty', 'mitaka', 'newton', 'ocata', 'pike', 'queens', 'rocky')'"

- pkgs = determine_packages(new_os_rel)
+ pkgs = determine_packages(new_src)

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit e6456473bf741e47c543b2b54a64242535000c93
Author: David Ames <email address hidden>
Date: Wed Sep 6 11:05:18 2017 -0700

    Fix src for determine_packages call during upgrade

    On upgrade the charm was sending incorrect source information to
    determine_packages. It was sending the os release name rather than
    the openstack-origin.

    Call with openstack-origin rather than os release name.

    Change-Id: Ifff4581a3b02414dd10854be86ef02e9413b9191
    Closes-Bug: #1715454