RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephadm: move configuration out of the way

Browse Source 
Signed-off-by: Joao Eduardo Luis <joao@suse.com>
This commit is contained in:
Joao Eduardo Luis 2020-12-31 00:41:48 +00:00
parent 6cab3f02aa
commit adc58849fe
No known key found for this signature in database
GPG Key ID: D3DCCB5DB5229660
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/cephadm/cephadm
View File

@ -3460,14 +3460,6 @@ def command_bootstrap(ctx):
logger.info('Enabling IPv6 (ms_bind_ipv6)')
cli(['config', 'set', 'global', 'ms_bind_ipv6', 'true'])
# create mgr
logger.info('Creating mgr...')
mgr_keyring = '[mgr.%s]\n\tkey = %s\n' % (mgr_id, mgr_key)
mgr_c = get_container(ctx, fsid, 'mgr', mgr_id)
# Note:the default port used by the Prometheus node exporter is opened in fw
deploy_daemon(ctx, fsid, 'mgr', mgr_id, mgr_c, uid, gid,
config=config, keyring=mgr_keyring, ports=[9283])
# output files
with open(ctx.args.output_keyring, 'w') as f:
os.fchmod(f.fileno(), 0o600)
@ -3479,6 +3471,14 @@ def command_bootstrap(ctx):
f.write(config)
logger.info('Wrote config to %s' % ctx.args.output_config)
# create mgr
logger.info('Creating mgr...')
mgr_keyring = '[mgr.%s]\n\tkey = %s\n' % (mgr_id, mgr_key)
mgr_c = get_container(ctx, fsid, 'mgr', mgr_id)
# Note:the default port used by the Prometheus node exporter is opened in fw
deploy_daemon(ctx, fsid, 'mgr', mgr_id, mgr_c, uid, gid,
config=config, keyring=mgr_keyring, ports=[9283])
# wait for the service to become available
logger.info('Waiting for mgr to start...')
def is_mgr_available():