]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: add-repo: Don't test for podman
authorSebastian Wagner <sebastian.wagner@suse.com>
Thu, 9 Apr 2020 07:50:37 +0000 (09:50 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 22 Apr 2020 13:06:38 +0000 (15:06 +0200)
Fixes:

```
root@buster:/cephadm# ./cephadm add-repo
Unable to locate any of ['podman', 'docker']
```

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 0d22708cc2f858491604b09f87e7af742884cb3c)

src/cephadm/cephadm

index 05b6fd0ba61d417d31105728074230406e8605a1..0843314e8d2d6a01f1a9f3589dcdff9055dea48f 100755 (executable)
@@ -4470,7 +4470,8 @@ if __name__ == "__main__":
                     break
                 except Exception as e:
                     logger.debug('Could not locate %s: %s' % (i, e))
-            if not container_path and args.func != command_prepare_host:
+            if not container_path and args.func != command_prepare_host\
+                    and args.func != command_add_repo:
                 sys.stderr.write('Unable to locate any of %s\n' % CONTAINER_PREFERENCE)
                 sys.exit(1)