Add legacy configure_ssl
Add legacy configure_ssl to octavia_handlers Pin pyparsing to 2.4.2 in wheelhouse.txt Update render unit test Closes-Bug: 1851487 Change-Id: I4dd055d43e62556692dca3f58f255769dab95287
This commit is contained in:
parent
b749c52496
commit
0b31603894
|
@ -153,6 +153,7 @@ def render(*args):
|
|||
"""
|
||||
with charm.provide_charm_instance() as octavia_charm:
|
||||
octavia_charm.render_with_interfaces(args)
|
||||
octavia_charm.configure_ssl()
|
||||
octavia_charm.enable_webserver_site()
|
||||
octavia_charm.assess_status()
|
||||
reactive.set_state('config.rendered')
|
||||
|
|
|
@ -4,5 +4,7 @@ python-novaclient
|
|||
python-neutronclient
|
||||
# tactical fix for https://github.com/celery/kombu/issues/1105
|
||||
amqp==2.5.1
|
||||
# REMOVEME -- fix for https://github.com/pyparsing/pyparsing/issues/164
|
||||
pyparsing==2.4.2
|
||||
neutron_lib
|
||||
pytest-runner
|
||||
|
|
|
@ -150,6 +150,8 @@ class TestOctaviaHandlers(test_utils.PatchHelper):
|
|||
handlers.render('arg1', 'arg2')
|
||||
self.octavia_charm.render_with_interfaces.assert_called_once_with(
|
||||
('arg1', 'arg2'))
|
||||
self.octavia_charm.configure_ssl.assert_called_once_with()
|
||||
self.octavia_charm.enable_webserver_site.assert_called_once_with()
|
||||
self.octavia_charm.assess_status.assert_called_once_with()
|
||||
self.set_state.assert_called_once_with('config.rendered')
|
||||
|
||||
|
|
Loading…
Reference in New Issue