Merge "Change mon-host config to monitor-hosts for consistency"
This commit is contained in:
commit
20d9a606a0
|
@ -88,7 +88,7 @@ Please refer to the [Ceph Network Reference](http://docs.ceph.com/docs/master/ra
|
|||
|
||||
**NOTE**: Existing deployments using ceph-*-network configuration options will continue to function; these options are preferred over any network space binding provided if set.
|
||||
|
||||
**NOTE**: The mon-hosts field is only used to migrate existing clusters to a juju managed solution and should be left blank otherwise.
|
||||
**NOTE**: The monitor-hosts field is only used to migrate existing clusters to a juju managed solution and should be left blank otherwise.
|
||||
|
||||
# Contact Information
|
||||
|
||||
|
|
|
@ -62,11 +62,11 @@ options:
|
|||
How many nodes to wait for before trying to create the monitor cluster
|
||||
this number needs to be odd, and more than three is a waste except for
|
||||
very large clusters.
|
||||
mon-hosts:
|
||||
monitor-hosts:
|
||||
type: string
|
||||
default:
|
||||
description: |
|
||||
A comma separated list of ceph mon hosts to use. This field is only
|
||||
A space separated list of ceph mon hosts to use. This field is only
|
||||
used to migrate an existing cluster to a juju managed solution
|
||||
and should be left blank otherwise.
|
||||
expected-osd-count:
|
||||
|
|
|
@ -137,7 +137,7 @@ def get_ceph_context():
|
|||
|
||||
cephcontext = {
|
||||
'auth_supported': config('auth-supported'),
|
||||
'mon_hosts': config('mon-hosts') or ' '.join(get_mon_hosts()),
|
||||
'mon_hosts': config('monitor-hosts') or ' '.join(get_mon_hosts()),
|
||||
'fsid': leader_get('fsid'),
|
||||
'old_auth': cmp_pkgrevno('ceph', "0.51") < 0,
|
||||
'use_syslog': str(config('use-syslog')).lower(),
|
||||
|
@ -465,10 +465,11 @@ def admin_relation_joined(relid=None):
|
|||
if name is None:
|
||||
name = 'admin'
|
||||
log('mon cluster in quorum - providing client with keys')
|
||||
mon_hosts = config('monitor-hosts') or ' '.join(get_mon_hosts())
|
||||
data = {'key': ceph.get_named_key(name=name, caps=ceph.admin_caps),
|
||||
'fsid': leader_get('fsid'),
|
||||
'auth': config('auth-supported'),
|
||||
'mon_hosts': config('mon-hosts') or " ".join(get_mon_hosts())
|
||||
'mon_hosts': mon_hosts,
|
||||
}
|
||||
relation_set(relation_id=relid,
|
||||
relation_settings=data)
|
||||
|
|
|
@ -22,7 +22,7 @@ CHARM_CONFIG = {'config-flags': '',
|
|||
'osd-journal-size': 1024,
|
||||
'use-direct-io': True,
|
||||
'osd-format': 'ext4',
|
||||
'mon-hosts': '',
|
||||
'monitor-hosts': '',
|
||||
'prefer-ipv6': False}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue