From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Dec 2019 22:00:40 +0000 (-0600)
Subject: Merge PR #32390 into master
X-Git-Tag: v15.1.0~391
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=319c9cc42ccfa885cc15dfedc063dc776dab6086;p=ceph-ci.git

Merge PR #32390 into master

* refs/pull/32390/head:
	cephadm: create /var/run/ceph/$fsid as needed

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

319c9cc42ccfa885cc15dfedc063dc776dab6086
diff --cc src/cephadm/cephadm
index d82d8bfb25a,f51a697782f..5fe526ecf61
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -1731,7 -1713,20 +1737,8 @@@ def command_deploy()
  
      if daemon_type in Ceph.daemons:
          (config, keyring, crash_keyring) = get_config_and_both_keyrings()
 -        if daemon_type == 'mon':
 -            if args.mon_ip:
 -                config += '[mon.%s]\n\tpublic_addr = %s\n' % (daemon_id, args.mon_ip)
 -            elif args.mon_addrv:
 -                config += '[mon.%s]\n\tpublic_addrv = %s\n' % (daemon_id,
 -                                                            args.mon_addrv)
 -            elif args.mon_network:
 -                config += '[mon.%s]\n\tpublic_network = %s\n' % (daemon_id,
 -                                                                args.mon_network)
 -            else:
 -                raise Error('must specify --mon-ip or --mon-network')
 -
          (uid, gid) = extract_uid_gid()
+         make_var_run(args.fsid, uid, gid)
          c = get_container(args.fsid, daemon_type, daemon_id)
          deploy_daemon(args.fsid, daemon_type, daemon_id, c, uid, gid,
                        config, keyring,