openstack
/
charm-manila-ganesha
Code Issues Proposed changes

Merge "Change Ganesha to HA deploy"

This commit is contained in:
Zuul 2020-05-26 14:37:17 +00:00 committed by Gerrit Code Review
parent fa93de951e d4f0215a1b
commit 3bfbc392d6
8 changed files with 118 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib/charm/openstack/manila_ganesha.py
View File

@ -21,7 +21,11 @@ import charms_openstack.charm
import charms_openstack.adapters
import charms_openstack.plugins
import charmhelpers.contrib.network.ip as ch_net_ip
from charmhelpers.core.hookenv import log
from charmhelpers.core.hookenv import (
config,
log,
)
from charmhelpers.contrib.hahelpers.cluster import is_clustered
from charmhelpers.contrib.storage.linux.ceph import (
CephBrokerRq,
send_request_if_needed,
@ -56,6 +60,11 @@ def access_ip(config):
return config.charm_instance.access_ip
@charms_openstack.adapters.config_property
def local_ip(_config):
return ch_net_ip.get_relation_ip('tenant-storage')
@charms_openstack.adapters.config_property
def use_memcache(config):
"""Do not enable memcache."""
@ -152,8 +161,8 @@ class ManilaGaneshaCharm(charms_openstack.charm.HAOpenStackCharm,
adapters_class = GaneshaCharmRelationAdapters
# ceph_key_per_unit_name = True
services = [
'nfs-ganesha',
'manila-share',
# 'nfs-ganesha',
# 'manila-share',
]
ha_resources = ['vips', 'dnsha']
release_pkg = 'manila-common'
@ -177,7 +186,19 @@ class ManilaGaneshaCharm(charms_openstack.charm.HAOpenStackCharm,
@property
def access_ip(self):
return ch_net_ip.get_relation_ip('tenant-storage')
vips = config().get('vip')
if vips:
vips = vips.split()
clustered = is_clustered()
net_addr = ch_net_ip.get_relation_ip('tenant-storage')
bound_cidr = ch_net_ip.resolve_network_cidr(
ch_net_ip.network_get_primary_address('tenant-storage')
)
if clustered and vips:
for vip in vips:
if ch_net_ip.is_address_in_network(bound_cidr, vip):
return vip
return net_addr
def enable_memcache(self, *args, **kwargs):
return False

44
src/reactive/manila_ganesha.py
View File

@ -16,6 +16,7 @@ charms_openstack.bus.discover()
charm.use_defaults(
'charm.installed',
'amqp.connected',
'cluster.available',
'shared-db.connected',
'config.changed',
'update-status',
@ -80,6 +81,15 @@ def render_things(*args):
charm_instance.assess_status()
@reactive.when('config.rendered')
@reactive.when_not('ha.connected')
def enable_services_in_non_ha():
with charm.provide_charm_instance() as charm_instance:
for service in charm_instance.services:
ch_core.host.service('enable', service)
ch_core.host.service('start', service)
@reactive.when_all('config.rendered',
'ceph.pools.available')
@reactive.when_not('ganesha-pool-configured')
@ -93,3 +103,37 @@ def configure_ganesha(*args):
reactive.set_flag('ganesha-pool-configured')
except subprocess.CalledProcessError:
log("Failed to setup ganesha index object")
@reactive.when('ha.connected', 'ganesha-pool-configured',
'config.rendered')
def cluster_connected(hacluster):
"""Configure HA resources in corosync"""
with charm.provide_charm_instance() as this_charm:
this_charm.configure_ha_resources(hacluster)
for service in ['nfs-ganesha', 'manila-share']:
ch_core.host.service('disable', service)
ch_core.host.service('stop', service)
hacluster.add_systemd_service('nfs-ganesha',
'nfs-ganesha',
clone=False)
hacluster.add_systemd_service('manila-share',
'manila-share',
clone=False)
# This is a bit of a nasty hack to ensure that we can colocate the
# services to make manila + ganesha colocate. This can be tidied up
# once
# https://bugs.launchpad.net/charm-interface-hacluster/+bug/1880644
# is resolved
import hooks.relations.hacluster.common as hacluster_common # noqa
crm = hacluster_common.CRM()
crm.colocation('ganesha_with_vip',
'inf',
'res_nfs_ganesha_nfs_ganesha',
'grp_ganesha_vips')
crm.colocation('manila_with_vip',
'inf',
'res_manila_share_manila_share',
'grp_ganesha_vips')
hacluster.manage_resources(crm)
this_charm.assess_status()

2
src/tests/bundles/bionic-rocky.yaml
View File

@ -3,7 +3,7 @@ options:
source: &source cloud:bionic-rocky
services:
manila-ganesha:
num_units: 1
num_units: 3
series: bionic
charm: ../../../manila-ganesha
options:

2
src/tests/bundles/bionic-stein.yaml
View File

@ -3,7 +3,7 @@ options:
source: &source cloud:bionic-stein
services:
manila-ganesha:
num_units: 1
num_units: 3
series: bionic
charm: ../../../manila-ganesha
options:

2
src/tests/bundles/bionic-train.yaml
View File

@ -3,7 +3,7 @@ options:
source: &source cloud:bionic-train
services:
manila-ganesha:
num_units: 1
num_units: 3
series: bionic
charm: ../../../manila-ganesha
options:

11
src/tests/bundles/overlays/local-charm-overlay.yaml.j2 Normal file
View File

@ -0,0 +1,11 @@
# Add True HA
applications:
manila-ganesha:
options:
vip: '{{ OS_VIP00 }}'
hacluster:
charm: cs:~openstack-charmers-next/hacluster
num_units: 0
relations:
- - manila-ganesha
- hacluster

31
unit_tests/test_lib_charm_openstack_manila_ganesha.py
View File

@ -29,7 +29,7 @@ class Helper(test_utils.PatchHelper):
self.patch_release(manila_ganesha.ManilaGaneshaCharm.release)
class TestOctaviaCharm(Helper):
class TestManilaGaneshaCharm(Helper):
def test_request_ceph_permissions(self):
self.patch_object(manila_ganesha, 'send_request_if_needed')
@ -39,3 +39,32 @@ class TestOctaviaCharm(Helper):
c.request_ceph_permissions(ceph)
ceph.set_local.assert_called_once()
self.send_request_if_needed.assert_called_once()
def test_access_ip_without_vip(self):
self.patch_object(manila_ganesha, 'is_clustered')
self.patch_object(manila_ganesha.ch_net_ip, 'get_relation_ip')
self.patch_object(manila_ganesha.ch_net_ip, 'is_address_in_network')
self.is_clustered.return_value = False
self.get_relation_ip.return_value = "10.0.0.1"
c = manila_ganesha.ManilaGaneshaCharm()
self.assertEqual(c.access_ip, "10.0.0.1")
self.is_clustered.assert_called_once()
self.get_relation_ip.assert_called_once_with('tenant-storage')
self.is_address_in_network.assert_not_called()
def test_access_ip_with_vip(self):
self.patch_object(manila_ganesha, 'config')
self.patch_object(manila_ganesha, 'is_clustered')
self.patch_object(manila_ganesha.ch_net_ip, 'get_relation_ip')
self.patch_object(manila_ganesha.ch_net_ip, 'is_address_in_network')
self.patch_object(manila_ganesha.ch_net_ip, 'resolve_network_cidr')
self.config.return_value = {'vip': '10.0.0.10'}
self.is_clustered.return_value = True
self.get_relation_ip.return_value = "10.0.0.1"
self.resolve_network_cidr.return_value = '10.0.0.0/24'
c = manila_ganesha.ManilaGaneshaCharm()
self.assertEqual(c.access_ip, "10.0.0.10")
self.is_clustered.assert_called_once()
self.get_relation_ip.assert_called_once_with('tenant-storage')
self.is_address_in_network.assert_called_once_with(
'10.0.0.0/24', '10.0.0.10')

5
unit_tests/test_manila_ganesha_handlers.py
View File

@ -46,11 +46,16 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
'manila-plugin.available',
'shared-db.available',
'identity-service.available'),
'cluster_connected': ('ha.connected',
'ganesha-pool-configured',
'config.rendered',),
'enable_services_in_non_ha': ('config.rendered',),
},
'when_not': {
'ceph_connected': ('ceph.available',),
'configure_ident_username': ('identity-service.available',),
'configure_ganesha': ('ganesha-pool-configured',),
'enable_services_in_non_ha': ('ha.connected',),
},
'when_all': {
'configure_ganesha': ('config.rendered',