From 77f20e725c98b336cbea634eab8d50b3f979375c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Juan=20Miguel=20Olmo=20Mart=C3=ADnez?= <jolmomar@redhat.com>
Date: Tue, 15 Jan 2019 18:04:06 +0100
Subject: [PATCH] mgr/ansible: Replace deprecated <get_config> calls
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Changes needed to replace the obsolete get_config by the new get_module_option manager module method

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
---
 src/pybind/mgr/ansible/module.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/pybind/mgr/ansible/module.py b/src/pybind/mgr/ansible/module.py
index 0d2210324a8..79684588a02 100644
--- a/src/pybind/mgr/ansible/module.py
+++ b/src/pybind/mgr/ansible/module.py
@@ -179,13 +179,11 @@ class Module(MgrModule, orchestrator.Orchestrator):
     """An Orchestrator that an external Ansible runner service to perform
     operations
     """
-
-    OPTIONS = [
+    MODULE_OPTIONS = [
         {'name': 'server_url'},
         {'name': 'username'},
         {'name': 'password'},
         {'name': 'verify_server'} # Check server identity (Boolean/path to CA bundle)
-
     ]
 
     def __init__(self, *args, **kwargs):
@@ -234,10 +232,10 @@ class Module(MgrModule, orchestrator.Orchestrator):
 
         # Ansible runner service client
         try:
-            self.ar_client = Client(server_url = self.get_config('server_url', ''),
-                                    user = self.get_config('username', ''),
-                                    password = self.get_config('password', ''),
-                                    verify_server = self.get_config('verify_server', True),
+            self.ar_client = Client(server_url = self.get_module_option('server_url', ''),
+                                    user = self.get_module_option('username', ''),
+                                    password = self.get_module_option('password', ''),
+                                    verify_server = self.get_module_option('verify_server', True),
                                     logger = self.log)
         except Exception:
             self.log.exception("Ansible Runner Service not available. "
@@ -292,25 +290,25 @@ class Module(MgrModule, orchestrator.Orchestrator):
 
     def verify_config(self):
 
-        if not self.get_config('server_url', ''):
+        if not self.get_module_option('server_url', ''):
             self.log.error(
                 "No Ansible Runner Service base URL <server_name>:<port>"
                 "Try 'ceph config set mgr mgr/%s/server_url <server name/ip>:<port>'",
                 self.module_name)
 
-        if not self.get_config('username', ''):
+        if not self.get_module_option('username', ''):
             self.log.error(
                 "No Ansible Runner Service user. "
                 "Try 'ceph config set mgr mgr/%s/username <string value>'",
                 self.module_name)
 
-        if not self.get_config('password', ''):
+        if not self.get_module_option('password', ''):
             self.log.error(
                 "No Ansible Runner Service User password. "
                 "Try 'ceph config set mgr mgr/%s/password <string value>'",
                 self.module_name)
 
-        if not self.get_config('verify_server', ''):
+        if not self.get_module_option('verify_server', ''):
             self.log.error(
                 "TLS server identity verification is enabled by default."
                 "Use 'ceph config set mgr mgr/{0}/verify_server False' to disable it."
-- 
2.39.5