]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #28986 from sebastian-philipp/orchestrator-verify-certificate
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 23 Jul 2019 07:46:02 +0000 (09:46 +0200)
committerGitHub <noreply@github.com>
Tue, 23 Jul 2019 07:46:02 +0000 (09:46 +0200)
pybind/mgr: Remove code duplication

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
1  2 
src/pybind/mgr/ansible/module.py

index 77d2d41a65effe9bbbe8de2c1896142d4a265853,f353d4fb0ebbc40676bfec381a6a971f96457890..3fe83eab208f88c2fd1979843d9da181a628f567
@@@ -14,11 -14,10 +14,11 @@@ import request
  
  from mgr_module import MgrModule, Option, CLIWriteCommand
  import orchestrator
+ from mgr_util import verify_tls_files, ServerConfigException
  
  from .ansible_runner_svc import Client, PlayBookExecution, ExecutionStatusCode,\
 -                                AnsibleRunnerServiceError
 +                                AnsibleRunnerServiceError, InventoryGroup,\
 +                                URL_MANAGE_GROUP, URL_ADD_RM_HOSTS
  
  from .output_wizards import ProcessInventory, ProcessPlaybookResult, \
                              ProcessHostsList