Catalog endpoint_type breaks amulet_tests

[Jorge Niedbalski]

<basic_deployment.NovaOpenStackAmuletUtils object at 0x7fab2027add0>>}
DEBUG:runner:2017-06-15 09:24:39,565 test_300_nova_default_config DEBUG: Checking nova config file data...
DEBUG:runner:Traceback (most recent call last):
DEBUG:runner: File "/tmp/bundletester-JSs5nW/nova-cloud-controller/tests/gate-basic-xenial-mitaka", line 24, in <module>
DEBUG:runner: deployment.run_tests()
DEBUG:runner: File "/var/lib/jenkins/checkout/0/nova-cloud-controller/.tox/func27-smoke/local/lib/python2.7/site-packages/charmhelpers/contrib/amulet/deployment.py", line 97, in run_tests
DEBUG:runner: getattr(self, test)()
DEBUG:runner: File "/tmp/bundletester-JSs5nW/nova-cloud-controller/tests/basic_deployment.py", line 611, in test_300_nova_default_config
DEBUG:runner: service_type='identity', endpoint_type='publicURL')
DEBUG:runner: File "/var/lib/jenkins/checkout/0/nova-cloud-controller/.tox/func27-smoke/local/lib/python2.7/site-packages/positional/__init__.py", line 101, in inner
DEBUG:runner: return wrapped(*args, **kwargs)
DEBUG:runner:TypeError: url_for() got an unexpected keyword argument 'endpoint_type'
DEBUG:runner:Exit Code: 1
DEBUG:bundletester.utils:Updating JUJU_MODEL: "auto-osci-sv03:admin/auto-osci-sv03" -> ""
DEBUG:bundletester.fetchers:git rev-parse HEAD: 133b1cc61feb20fed7009ebd2e1fa86da4499e0b

->>
Since >= liberty the url_for parameter endpoint_type was replaced by interface
https://github.com/openstack/keystoneauth/commit/d227f6d237c4309b21a32a115fc5b09b9ba46ef0

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/475011
Committed: https://git.openstack.org/cgit/openstack/charm-nova-cloud-controller/commit/?id=5d3c601dd43e8889d7cc2a4e3e9ce7a2cb02afc0
Submitter: Jenkins
Branch: master

commit 5d3c601dd43e8889d7cc2a4e3e9ce7a2cb02afc0
Author: Jorge Niedbalski <email address hidden>
Date: Fri Jun 16 11:31:11 2017 -0400

    Use interface param and fallback to endpoint_type on url_for.

    Since >= liberty the url_for parameter endpoint_type was replaced by
    interface https://github.com/openstack/keystoneauth/commit/d227f6d237c4309b21a32a115fc5b09b9ba46ef0

    Change-Id: I98ebbf9f2c7582fae5f466dfc1d224bf66e38a24
    Closes-Bug: #1698398
    Signed-off-by: Jorge Niedbalski <email address hidden>