Merge PR #32390 into master

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

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

diff --cc src/cephadm/cephadm
index d82d8bfb25a047fd5cc5e8286411e3252e9a8e87,f51a697782fdc2e94c2729044b33ea9d0be47591..5fe526ecf6152da0a2be455f68d4754c59413d73
--- 1/src/cephadm/cephadm
--- 2/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,