mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Migrated to cmd.run_all and tested on working srv
This commit is contained in:
Claudiu Popescu
parent
a1dddce6fd
commit
47bfba1018
3 changed files with 20 additions and 32 deletions
|
|
@ -14,7 +14,7 @@ import logging
|
|||
# Import Salt libs
|
||||
import salt.utils.path
|
||||
import salt.utils.platform
|
||||
from salt.utils.icinga2 import get_certs_path, execute
|
||||
from salt.utils.icinga2 import get_certs_path
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ def generate_ticket(domain):
|
|||
salt '*' icinga2.generate_ticket domain.tld
|
||||
|
||||
'''
|
||||
result = execute(["icinga2", "pki", "ticket", "--cn", domain])
|
||||
result = __salt__['cmd.run_all'](["icinga2", "pki", "ticket", "--cn", domain], python_shell=False)
|
||||
return result
|
||||
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ def generate_cert(domain):
|
|||
salt '*' icinga2.generate_cert domain.tld
|
||||
|
||||
'''
|
||||
result = execute(["icinga2", "pki", "new-cert", "--cn", domain, "--key", "{0}{1}.key".format(get_certs_path(), domain), "--cert", "{0}{1}.crt".format(get_certs_path(), domain)], ret_code=True)
|
||||
result = __salt__['cmd.run_all'](["icinga2", "pki", "new-cert", "--cn", domain, "--key", "{0}{1}.key".format(get_certs_path(), domain), "--cert", "{0}{1}.crt".format(get_certs_path(), domain)], python_shell=False)
|
||||
return result
|
||||
|
||||
|
||||
|
|
@ -82,8 +82,8 @@ def save_cert(domain, master):
|
|||
salt '*' icinga2.save_cert domain.tld master.domain.tld
|
||||
|
||||
'''
|
||||
result = execute(["icinga2", "pki", "save-cert", "--key", "{0}{1}.key".format(get_certs_path(), domain), "--cert", "{0}{1}.cert".format(get_certs_path(), domain), "--trustedcert",
|
||||
"{0}trusted-master.crt".format(get_certs_path()), "--host", master], ret_code=True)
|
||||
result = __salt__['cmd.run_all'](["icinga2", "pki", "save-cert", "--key", "{0}{1}.key".format(get_certs_path(), domain), "--cert", "{0}{1}.cert".format(get_certs_path(), domain), "--trustedcert",
|
||||
"{0}trusted-master.crt".format(get_certs_path()), "--host", master], python_shell=False)
|
||||
return result
|
||||
|
||||
|
||||
|
|
@ -102,8 +102,8 @@ def request_cert(domain, master, ticket, port):
|
|||
salt '*' icinga2.request_cert domain.tld master.domain.tld TICKET_ID
|
||||
|
||||
'''
|
||||
result = execute(["icinga2", "pki", "request", "--host", master, "--port", port, "--ticket", ticket, "--key", "{0}{1}.key".format(get_certs_path(), domain), "--cert",
|
||||
"{0}{1}.crt".format(get_certs_path(), domain), "--trustedcert", "{0}trusted-master.crt".format{get_certs_path()), "--ca", "{0}ca.crt".format(get_certs_path())], ret_code=True)
|
||||
result = __salt__['cmd.run_all'](["icinga2", "pki", "request", "--host", master, "--port", port, "--ticket", ticket, "--key", "{0}{1}.key".format(get_certs_path(), domain), "--cert",
|
||||
"{0}{1}.crt".format(get_certs_path(), domain), "--trustedcert", "{0}trusted-master.crt".format(get_certs_path()), "--ca", "{0}ca.crt".format(get_certs_path())], python_shell=False)
|
||||
return result
|
||||
|
||||
|
||||
|
|
@ -122,6 +122,6 @@ def node_setup(domain, master, ticket):
|
|||
salt '*' icinga2.node_setup domain.tld master.domain.tld TICKET_ID
|
||||
|
||||
'''
|
||||
result = execute(["icinga2", "node", "setup", "--ticket", ticket, "--endpoint", master, "--zone", domain, "--master_host", master, "--trustedcert", "{0}trusted-master.crt".format(get_certs_path())],
|
||||
ret_code=True)
|
||||
result = __salt__['cmd.run_all'](["icinga2", "node", "setup", "--ticket", ticket, "--endpoint", master, "--zone", domain, "--master_host", master, "--trustedcert", "{0}trusted-master.crt".format(get_certs_path())],
|
||||
python_shell=False)
|
||||
return result
|
||||
|
|
|
|||
|
|
@ -104,8 +104,9 @@ def generate_ticket(name, output=None, grain=None, key=None, overwrite=True):
|
|||
return ret
|
||||
|
||||
# Executing the command.
|
||||
ticket = __salt__['icinga2.generate_ticket'](name).strip()
|
||||
if ticket:
|
||||
ticket_res = __salt__['icinga2.generate_ticket'](name)
|
||||
ticket = ticket_res['stdout']
|
||||
if not ticket_res['retcode']:
|
||||
ret['comment'] = six.text_type(ticket)
|
||||
|
||||
if output == 'grain':
|
||||
|
|
@ -155,7 +156,7 @@ def generate_cert(name):
|
|||
|
||||
# Executing the command.
|
||||
cert_save = __salt__['icinga2.generate_cert'](name)
|
||||
if not cert_save:
|
||||
if not cert_save['retcode']:
|
||||
ret['comment'] = "Certificate and key generated"
|
||||
ret['changes']['cert'] = "Executed. Certificate saved: {0}".format(cert)
|
||||
ret['changes']['key'] = "Executed. Key saved: {0}".format(key)
|
||||
|
|
@ -189,7 +190,7 @@ def save_cert(name, master):
|
|||
|
||||
# Executing the command.
|
||||
cert_save = __salt__['icinga2.save_cert'](name, master)
|
||||
if not cert_save:
|
||||
if not cert_save['retcode']:
|
||||
ret['comment'] = "Certificate for icinga2 master saved"
|
||||
ret['changes']['cert'] = "Executed. Certificate saved: {0}".format(cert)
|
||||
return ret
|
||||
|
|
@ -228,12 +229,12 @@ def request_cert(name, master, ticket, port="5665"):
|
|||
|
||||
# Executing the command.
|
||||
cert_request = __salt__['icinga2.request_cert'](name, master, ticket, port)
|
||||
if not cert_request:
|
||||
if not cert_request['retcode']:
|
||||
ret['comment'] = "Certificate request from icinga2 master executed"
|
||||
ret['changes']['cert'] = "Executed. Certificate requested: {0}".format(cert)
|
||||
return ret
|
||||
|
||||
ret['comment'] = "FAILED. Certificate requested failed with exit code: {0}".format(cert_request)
|
||||
ret['comment'] = "FAILED. Certificate requested failed with output: {0}".format(cert_request['stdout'])
|
||||
ret['result'] = False
|
||||
return ret
|
||||
|
||||
|
|
@ -269,11 +270,11 @@ def node_setup(name, master, ticket):
|
|||
|
||||
# Executing the command.
|
||||
node_setup = __salt__['icinga2.node_setup'](name, master, ticket)
|
||||
if not node_setup:
|
||||
if not node_setup['retcode']:
|
||||
ret['comment'] = "Node setup executed."
|
||||
ret['changes']['cert'] = "Node setup finished successfully."
|
||||
return ret
|
||||
|
||||
ret['comment'] = "FAILED. Node setup failed with exit code: {0}".format(node_setup)
|
||||
ret['comment'] = "FAILED. Node setup failed with outpu: {0}".format(node_setup['stdout'])
|
||||
ret['result'] = False
|
||||
return ret
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ This module provides common functionality for icinga2 module and state.
|
|||
|
||||
# Import python libs
|
||||
import logging
|
||||
import subprocess
|
||||
import re
|
||||
|
||||
# Import Salt libs
|
||||
|
|
@ -19,21 +18,9 @@ import salt.utils.path
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def execute(cmd, ret_code=False):
|
||||
process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
if ret_code:
|
||||
return process.wait()
|
||||
output, error = process.communicate()
|
||||
if output:
|
||||
log.debug(output)
|
||||
return output
|
||||
log.debug(error)
|
||||
return error
|
||||
|
||||
|
||||
def get_certs_path():
|
||||
icinga2_output = execute([salt.utils.path.which('icinga2'), "--version"])
|
||||
version = re.search('r\d+\.\d+', icinga2_output).group(0)
|
||||
icinga2_output = __salt__['cmd.run_all']([salt.utils.path.which('icinga2'), "--version"], python_shell=False)
|
||||
version = re.search('r\d+\.\d+', icinga2_output['stdout']).group(0)
|
||||
# Return new certs path for icinga2 >= 2.8
|
||||
if int(version.split('.')[1]) >= 8:
|
||||
return '/var/lib/icinga2/certs/'
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue