[ed-hope-morley] added support for ceph-client use_rsyslog option
This commit is contained in:
parent
b87a051d7c
commit
5d1b80c5a0
@ -23,6 +23,9 @@ CEPH_CONF = """[global]
|
||||
auth supported = %(auth)s
|
||||
keyring = %(keyring)s
|
||||
mon host = %(mon_hosts)s
|
||||
log to syslog = %s(use_syslog)s
|
||||
err to syslog = %s(use_syslog)s
|
||||
clog to syslog = %s(use_syslog)s
|
||||
"""
|
||||
|
||||
|
||||
@ -165,7 +168,7 @@ def get_ceph_nodes():
|
||||
return hosts
|
||||
|
||||
|
||||
def configure(service, key, auth):
|
||||
def configure(service, key, auth, use_syslog):
|
||||
create_keyring(service, key)
|
||||
create_key_file(service, key)
|
||||
hosts = get_ceph_nodes()
|
||||
|
@ -279,11 +279,13 @@ def ceph_changed():
|
||||
utils.juju_log('INFO', 'Start Ceph Relation Changed')
|
||||
auth = utils.relation_get('auth')
|
||||
key = utils.relation_get('key')
|
||||
use_syslog = utils.relation_get('use_syslog')
|
||||
if None in [auth, key]:
|
||||
utils.juju_log('INFO', 'Missing key or auth in relation')
|
||||
sys.exit(0)
|
||||
|
||||
ceph.configure(service=SERVICE_NAME, key=key, auth=auth)
|
||||
ceph.configure(service=SERVICE_NAME, key=key, auth=auth,
|
||||
use_syslog=use_syslog)
|
||||
|
||||
if cluster.eligible_leader('res_rabbitmq_vip'):
|
||||
rbd_img = utils.config_get('rbd-name')
|
||||
|
Loading…
Reference in New Issue
Block a user