]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
don't use os.path.join() on a single path component
authorRishabh Dave <ridave@redhat.com>
Mon, 11 Mar 2019 10:22:42 +0000 (15:52 +0530)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Thu, 14 Mar 2019 22:35:12 +0000 (22:35 +0000)
Signed-off-by: Rishabh Dave <ridave@redhat.com>
library/ceph_key.py
library/ceph_volume.py

index fa9439e5b423876ea2cd9773d2ecf7f30790bbd2..d1150a7275e3f31e01159d46de1c176e1ae47347 100644 (file)
@@ -209,8 +209,7 @@ def container_exec(binary, container_image):
                     '-v', '/etc/ceph:/etc/ceph:z',
                     '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                     '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                    os.path.join('--entrypoint=' + binary),
-                    container_image]
+                    '--entrypoint=' + binary, container_image]
     return command_exec
 
 
index 1b51140e72f8fb815adab052192431f199ebee66..c07e920ac5ffd41724ff6385a3a9bf081b73578b 100644 (file)
@@ -196,8 +196,7 @@ def container_exec(binary, container_image):
                     '-v', '/run/lvm/:/run/lvm/',
                     '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                     '-v', '/var/log/ceph/:/var/log/ceph/:z',
-                    os.path.join('--entrypoint=' + binary),
-                    container_image]
+                    '--entrypoint=' + binary, container_image]
     return command_exec