From: Joshua Schmid <jschmid@suse.de>
Date: Tue, 12 May 2020 10:08:11 +0000 (+0200)
Subject: bin/cephadm: move --env-var handling to global argparser
X-Git-Tag: v16.1.0~2341^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84fdccdbeec72f326270b11be0034dff42a44471;p=ceph.git

bin/cephadm: move --env-var handling to global argparser

Signed-off-by: Joshua Schmid <jschmid@suse.de>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 8c47c4432992..39de2f84a72e 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2887,6 +2887,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,
@@ -4192,6 +4193,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')