RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/ansible: Replace deprecated <get_config> calls

Browse Source 
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>
This commit is contained in:
Juan Miguel Olmo Martínez 2019-01-15 18:04:06 +01:00
parent 80945c8b95
commit 77f20e725c
No known key found for this signature in database
GPG Key ID: F38428F191BEBAB1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pybind/mgr/ansible/module.py
View File

@ -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."