From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 23 Jul 2019 07:46:02 +0000 (+0200)
Subject: Merge pull request #28986 from sebastian-philipp/orchestrator-verify-certificate
X-Git-Tag: v15.1.0~2120
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4a91c6b001f2dc6ff6df72bf09fa103687c890a3;p=ceph-ci.git

Merge pull request #28986 from sebastian-philipp/orchestrator-verify-certificate

pybind/mgr: Remove code duplication

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
---

4a91c6b001f2dc6ff6df72bf09fa103687c890a3
diff --cc src/pybind/mgr/ansible/module.py
index 77d2d41a65e,f353d4fb0eb..3fe83eab208
--- a/src/pybind/mgr/ansible/module.py
+++ b/src/pybind/mgr/ansible/module.py
@@@ -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