diff --git a/charmhelpers/__init__.py b/charmhelpers/__init__.py
index 61ef90719b5d5d759de1a6b80a1ea748d8bb0911..1f57ed2adb8a109cb18c6f78be5218131fd7d1eb 100644
--- a/charmhelpers/__init__.py
+++ b/charmhelpers/__init__.py
@@ -49,7 +49,8 @@ __deprecated_functions = {}
def deprecate(warning, date=None, log=None):
"""Add a deprecation warning the first time the function is used.
- The date, which is a string in semi-ISO8660 format indicate the year-month
+
+ The date which is a string in semi-ISO8660 format indicates the year-month
that the function is officially going to be removed.
usage:
@@ -62,10 +63,11 @@ def deprecate(warning, date=None, log=None):
The reason for passing the logging function (log) is so that hookenv.log
can be used for a charm if needed.
- :param warning: String to indicat where it has moved ot.
- :param date: optional sting, in YYYY-MM format to indicate when the
+ :param warning: String to indicate what is to be used instead.
+ :param date: Optional string in YYYY-MM format to indicate when the
function will definitely (probably) be removed.
- :param log: The log function to call to log. If not, logs to stdout
+ :param log: The log function to call in order to log. If None, logs to
+ stdout
"""
def wrap(f):
diff --git a/charmhelpers/contrib/charmsupport/nrpe.py b/charmhelpers/contrib/charmsupport/nrpe.py
index d775861b0868a174a3f0f4a8d4a42320272a4cb0..14b80d96add5f6346fa147c9977eacec25b605ec 100644
--- a/charmhelpers/contrib/charmsupport/nrpe.py
+++ b/charmhelpers/contrib/charmsupport/nrpe.py
@@ -18,14 +18,14 @@
# Authors:
# Matthew Wedgwood <matthew.wedgwood@canonical.com>
-import subprocess
-import pwd
+import glob
import grp
import os
-import glob
-import shutil
+import pwd
import re
import shlex
+import shutil
+import subprocess
import yaml
from charmhelpers.core.hookenv import (
@@ -265,6 +265,11 @@ class NRPE(object):
relation_set(relation_id=rid, relation_settings={'primary': self.primary})
self.remove_check_queue = set()
+ @classmethod
+ def does_nrpe_conf_dir_exist(cls):
+ """Return True if th nrpe_confdif directory exists."""
+ return os.path.isdir(cls.nrpe_confdir)
+
def add_check(self, *args, **kwargs):
shortname = None
if kwargs.get('shortname') is None:
@@ -310,6 +315,12 @@ class NRPE(object):
nrpe_monitors = {}
monitors = {"monitors": {"remote": {"nrpe": nrpe_monitors}}}
+
+ # check that the charm can write to the conf dir. If not, then nagios
+ # probably isn't installed, and we can defer.
+ if not self.does_nrpe_conf_dir_exist():
+ return
+
for nrpecheck in self.checks:
nrpecheck.write(self.nagios_context, self.hostname,
self.nagios_servicegroups)
@@ -400,7 +411,7 @@ def add_init_service_checks(nrpe, services, unit_name, immediate_check=True):
upstart_init = '/etc/init/%s.conf' % svc
sysv_init = '/etc/init.d/%s' % svc
- if host.init_is_systemd():
+ if host.init_is_systemd(service_name=svc):
nrpe.add_check(
shortname=svc,
description='process check {%s}' % unit_name,
diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index f21625d3051f3d3257a5c1cfa630a841f3a9d6dc..0aa797c4335bdea001c20b141a7846a5f1755717 100644
--- a/charmhelpers/contrib/openstack/utils.py
+++ b/charmhelpers/contrib/openstack/utils.py
@@ -2241,10 +2241,13 @@ def inform_peers_unit_state(state, relation_name='cluster'):
if state not in UNIT_STATES:
raise ValueError(
"Setting invalid state {} for unit".format(state))
+ this_unit = local_unit()
for r_id in relation_ids(relation_name):
+ juju_log('Telling peer behind relation {} that {} is {}'.format(
+ r_id, this_unit, state), 'DEBUG')
relation_set(relation_id=r_id,
relation_settings={
- get_peer_key(local_unit()): state})
+ get_peer_key(this_unit): state})
def get_peers_unit_state(relation_name='cluster'):
@@ -2276,8 +2279,10 @@ def are_peers_ready(relation_name='cluster'):
:returns: Whether all units are ready.
:rtype: bool
"""
- unit_states = get_peers_unit_state(relation_name)
- return all(v == UNIT_READY for v in unit_states.values())
+ unit_states = get_peers_unit_state(relation_name).values()
+ juju_log('{} peers are in the following states: {}'.format(
+ relation_name, unit_states), 'DEBUG')
+ return all(state == UNIT_READY for state in unit_states)
def inform_peers_if_ready(check_unit_ready_func, relation_name='cluster'):
@@ -2360,7 +2365,9 @@ def get_api_application_status():
app_state, msg = get_api_unit_status()
if app_state == WORKLOAD_STATES.ACTIVE:
if are_peers_ready():
- return WORKLOAD_STATES.ACTIVE, 'Application Ready'
+ msg = 'Application Ready'
else:
- return WORKLOAD_STATES.WAITING, 'Some units are not ready'
+ app_state = WORKLOAD_STATES.WAITING
+ msg = 'Some units are not ready'
+ juju_log(msg, 'DEBUG')
return app_state, msg
diff --git a/charmhelpers/core/host.py b/charmhelpers/core/host.py
index b33ac906d9eeb198210dceb069724ac9a35652ea..a785efdf653901e80015fcd17b095125182d27ff 100644
--- a/charmhelpers/core/host.py
+++ b/charmhelpers/core/host.py
@@ -193,7 +193,7 @@ def service_pause(service_name, init_dir="/etc/init", initd_dir="/etc/init.d",
stopped = service_stop(service_name, **kwargs)
upstart_file = os.path.join(init_dir, "{}.conf".format(service_name))
sysv_file = os.path.join(initd_dir, service_name)
- if init_is_systemd():
+ if init_is_systemd(service_name=service_name):
service('disable', service_name)
service('mask', service_name)
elif os.path.exists(upstart_file):
@@ -227,7 +227,7 @@ def service_resume(service_name, init_dir="/etc/init",
"""
upstart_file = os.path.join(init_dir, "{}.conf".format(service_name))
sysv_file = os.path.join(initd_dir, service_name)
- if init_is_systemd():
+ if init_is_systemd(service_name=service_name):
service('unmask', service_name)
service('enable', service_name)
elif os.path.exists(upstart_file):
@@ -257,7 +257,7 @@ def service(action, service_name, **kwargs):
:param **kwargs: additional params to be passed to the service command in
the form of key=value.
"""
- if init_is_systemd():
+ if init_is_systemd(service_name=service_name):
cmd = ['systemctl', action, service_name]
else:
cmd = ['service', service_name, action]
@@ -281,7 +281,7 @@ def service_running(service_name, **kwargs):
units (e.g. service ceph-osd status id=2). The kwargs
are ignored in systemd services.
"""
- if init_is_systemd():
+ if init_is_systemd(service_name=service_name):
return service('is-active', service_name)
else:
if os.path.exists(_UPSTART_CONF.format(service_name)):
@@ -311,8 +311,14 @@ def service_running(service_name, **kwargs):
SYSTEMD_SYSTEM = '/run/systemd/system'
-def init_is_systemd():
- """Return True if the host system uses systemd, False otherwise."""
+def init_is_systemd(service_name=None):
+ """
+ Returns whether the host uses systemd for the specified service.
+
+ @param Optional[str] service_name: specific name of service
+ """
+ if str(service_name).startswith("snap."):
+ return True
if lsb_release()['DISTRIB_CODENAME'] == 'trusty':
return False
return os.path.isdir(SYSTEMD_SYSTEM)
diff --git a/requirements.txt b/requirements.txt
index 343beed192f73f18408852856fc8718ccb9b75be..2316401baf10e54e3368498cf2ea73722e82a271 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,9 @@ netifaces>=0.10.4
netaddr>=0.7.12,!=0.7.16
Jinja2>=2.6 # BSD License (3 clause)
six>=1.9.0
-dnspython>=1.12.0
+
+# dnspython 2.0.0 dropped py3.5 support
+dnspython<2.0.0; python_version < '3.6'
+dnspython; python_version >= '3.6'
+
psutil>=1.1.1,<2.0.0