openstack/charm-masakari
Code Issues Proposed changes

Fix upgrade check

Browse Source
This commit is contained in:
Liam Young 2019-03-20 11:42:05 +00:00
parent acad5c7d95
commit 130599835b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/charm/openstack/masakari.py
View File

@ -41,10 +41,10 @@ class MasakariCharm(charms_openstack.charm.HAOpenStackCharm):
ha_resources = ['vips', 'haproxy', 'dnsha'] ha_resources = ['vips', 'haproxy', 'dnsha']
release_pkg = 'masakari' release_pkg = 'masakari-api'
package_codenames = { package_codenames = {
'masakari-common': collections.OrderedDict([ 'masakari-api': collections.OrderedDict([
('2', 'mitaka'), ('2', 'mitaka'),
('3', 'newton'), ('3', 'newton'),
('4', 'ocata'), ('4', 'ocata'),

6
src/tests/bundles/bionic-rocky-pacemaker-remote.yaml
View File

@ -166,14 +166,14 @@ applications:
cinder-ceph: cinder-ceph:
charm: cinder-ceph charm: cinder-ceph
masakari-monitors: masakari-monitors:
charm: cs:~gnuoy/masakari-monitors-4 charm: cs:~gnuoy/masakari-monitors-5
hacluster: hacluster:
charm: cs:~gnuoy/hacluster-14 charm: cs:~gnuoy/hacluster-17
options: options:
corosync_transport: unicast corosync_transport: unicast
cluster_count: 3 cluster_count: 3
pacemaker-remote: pacemaker-remote:
charm: cs:~gnuoy/pacemaker-remote-6 charm: cs:~gnuoy/pacemaker-remote-7
options: options:
enable-stonith: False enable-stonith: False
enable-resources: False enable-resources: False

2
unit_tests/test_masakari_handlers.py
View File

@ -45,7 +45,7 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
self.registered_hooks_test_helper(handlers, hook_set, defaults) self.registered_hooks_test_helper(handlers, hook_set, defaults)
class TestRenderStuff(test_utils.PatchHelper): class TestHandlers(test_utils.PatchHelper):
def _patch_provide_charm_instance(self): def _patch_provide_charm_instance(self):
masakari_charm = mock.MagicMock() masakari_charm = mock.MagicMock()