]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
bin/cephadm: move --env-var handling to global argparser
authorJoshua Schmid <jschmid@suse.de>
Tue, 12 May 2020 10:08:11 +0000 (12:08 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 21 May 2020 21:33:18 +0000 (23:33 +0200)
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 84fdccdbeec72f326270b11be0034dff42a44471)

src/cephadm/cephadm

index 75f0ed6bf7a285d893d185e475f739ac5012e5a9..badcb77a59065e6b4d8ac61c817327579c59bb57 100755 (executable)
@@ -2884,6 +2884,7 @@ def command_ceph_volume():
     c = CephContainer(
         image=args.image,
         entrypoint='/usr/sbin/ceph-volume',
+        envs=args.env,
         args=args.command,
         privileged=True,
         volume_mounts=mounts,
@@ -4189,6 +4190,11 @@ def _get_parser():
         type=int,
         default=DEFAULT_RETRY,
         help='max number of retries')
+    parser.add_argument(
+        '--env', '-e',
+        action='append',
+        default=[],
+        help='set environment variable')
 
     subparsers = parser.add_subparsers(help='sub-command')