Merge "Re-enable scale in scale out test"
This commit is contained in:
commit
2f36583026
|
@ -847,7 +847,7 @@ class MySQLInnoDBClusterCharm(charms_openstack.charm.OpenStackCharm):
|
|||
:rtype: None
|
||||
"""
|
||||
_primary = self.get_cluster_primary_address(nocache=True)
|
||||
ch_core.hookenv.log("Rejoin instance: {}.".format(address))
|
||||
ch_core.hookenv.log("Remove instance: {}.".format(address))
|
||||
_script = (
|
||||
"shell.connect('{user}:{pw}@{caddr}')\n"
|
||||
"cluster = dba.get_cluster('{name}')\n"
|
||||
|
|
|
@ -291,6 +291,7 @@ def db_router_respond():
|
|||
@reactive.when('endpoint.cluster.changed.unit-configure-ready')
|
||||
@reactive.when('leadership.set.cluster-instances-clustered')
|
||||
@reactive.when('leadership.is_leader')
|
||||
@reactive.when('cluster.available')
|
||||
def scale_out():
|
||||
"""Handle scale-out adding new nodes to an existing cluster."""
|
||||
|
||||
|
|
|
@ -23,13 +23,13 @@ tests:
|
|||
- zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterScaleTest
|
||||
- zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
|
||||
gate_bundles:
|
||||
- scale_in_out: groovy
|
||||
- full_model: groovy-full-ha
|
||||
- scale_in_out: focal
|
||||
- full_model: focal-full-ha
|
||||
smoke_bundles:
|
||||
- focal
|
||||
dev_bundles:
|
||||
- scale_in_out: groovy
|
||||
- scale_in_out: focal
|
||||
tests_options:
|
||||
force_deploy:
|
||||
- groovy
|
||||
|
|
|
@ -66,7 +66,8 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
|
|||
"scale_out": (
|
||||
"endpoint.cluster.changed.unit-configure-ready",
|
||||
"leadership.set.cluster-instances-clustered",
|
||||
"leadership.is_leader",),
|
||||
"leadership.is_leader",
|
||||
"cluster.available",),
|
||||
"request_certificates": (
|
||||
"certificates.available",
|
||||
"cluster.available",),
|
||||
|
|
Loading…
Reference in New Issue