diff --git a/plugins/doc_fragments/ipamodule_base_docs.py b/plugins/doc_fragments/ipamodule_base_docs.py
index 10b1bb2b5177a0d174c757878fdf29f4f59e4690..e60df97b47a2b15b0fd7653dae03f6ae8efdcb16 100644
--- a/plugins/doc_fragments/ipamodule_base_docs.py
+++ b/plugins/doc_fragments/ipamodule_base_docs.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
class ModuleDocFragment(object): # pylint: disable=R0205,R0903
DOCUMENTATION = r"""
diff --git a/plugins/module_utils/ansible_freeipa_module.py b/plugins/module_utils/ansible_freeipa_module.py
index c6307aea0ac1e41319687dea65a7d4062b68956d..de09be1c98884f6a912a30d523f45b4a18adcc3c 100644
--- a/plugins/module_utils/ansible_freeipa_module.py
+++ b/plugins/module_utils/ansible_freeipa_module.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
__all__ = ["gssapi", "netaddr", "api", "ipalib_errors", "Env",
"DEFAULT_CONFIG", "LDAP_GENERALIZED_TIME_FORMAT",
"kinit_password", "kinit_keytab", "run", "DN", "VERSION",
@@ -100,7 +103,7 @@ else:
import socket
import base64
- import six
+ from ansible.module_utils import six
try:
from collections.abc import Mapping # noqa
diff --git a/plugins/modules/ipaautomember.py b/plugins/modules/ipaautomember.py
index 7230ea57f920fa3376cd561a8c953e4f64ef7499..27be1fc8c7c1e26d89ae943e71310991a655a37d 100644
--- a/plugins/modules/ipaautomember.py
+++ b/plugins/modules/ipaautomember.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -21,6 +20,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
"metadata_version": "1.0",
@@ -100,7 +102,7 @@ EXAMPLES = """
state: present
inclusive:
- key: "mail"
- expression: "example.com$
+ expression: "example.com"
# Delete an automember rule
- ipaautomember:
diff --git a/plugins/modules/ipaautomountlocation.py b/plugins/modules/ipaautomountlocation.py
index f1925ddc82c9d197e20ab1767b5139c0d998e4ba..8f0b77b7d91f5d873d71bc9e2a2db3fd2cb9d546 100644
--- a/plugins/modules/ipaautomountlocation.py
+++ b/plugins/modules/ipaautomountlocation.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
# Chris Procter <cprocter@redhat.com>
@@ -19,6 +18,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipaconfig.py b/plugins/modules/ipaconfig.py
index 1239fbc3cf98e354ad1b7511e41cb68eaae7d848..4b2df6a591032a8caafa3a65ba9677b4bf5a2936 100644
--- a/plugins/modules/ipaconfig.py
+++ b/plugins/modules/ipaconfig.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipadelegation.py b/plugins/modules/ipadelegation.py
index 335930568da0483274a2db85b88ab3df2658e572..6097a29ea299ad81997f7dc4bc71f8fe5de76277 100644
--- a/plugins/modules/ipadelegation.py
+++ b/plugins/modules/ipadelegation.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipadnsconfig.py b/plugins/modules/ipadnsconfig.py
index 889b7ee7c79b76ef032463f6bd55ce193dd4894c..f6d4c468c6114d45d6d8bfdc7b8272755f9d3dda 100644
--- a/plugins/modules/ipadnsconfig.py
+++ b/plugins/modules/ipadnsconfig.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -21,6 +20,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipadnsforwardzone.py b/plugins/modules/ipadnsforwardzone.py
index 09ff09b99eb6723f3e8bdb828f8a5a85d9856fdf..f8d19933e97f521c34827020191414346730aa78 100644
--- a/plugins/modules/ipadnsforwardzone.py
+++ b/plugins/modules/ipadnsforwardzone.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipadnsrecord.py b/plugins/modules/ipadnsrecord.py
index 9f8d27720c1a30fe8782b91541c4777983cb4f00..dc72803120148ff58c3b18d6ab1a35b136de1ed7 100644
--- a/plugins/modules/ipadnsrecord.py
+++ b/plugins/modules/ipadnsrecord.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
"""DNS Record ansible-freeipa module."""
ANSIBLE_METADATA = {
@@ -866,8 +869,7 @@ from ansible.module_utils.ansible_freeipa_module import \
import dns.reversename
import dns.resolver
-import six
-
+from ansible.module_utils import six
if six.PY3:
unicode = str
diff --git a/plugins/modules/ipadnszone.py b/plugins/modules/ipadnszone.py
index c1354d3aca2ae6e31c1447d23c5e4c7b247f0277..f4dbc8eeca5d2683518fff4ce03cb2cc98923232 100644
--- a/plugins/modules/ipadnszone.py
+++ b/plugins/modules/ipadnszone.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
@@ -207,7 +210,7 @@ from ansible.module_utils.ansible_freeipa_module import (
ipalib_errors
) # noqa: E402
import netaddr
-import six
+from ansible.module_utils import six
if six.PY3:
diff --git a/plugins/modules/ipagroup.py b/plugins/modules/ipagroup.py
index 2815b460dd8ffa9802d03f51813f3d36f208fe1c..979bf62318d2b47a8a58362c991062d7ff99dda8 100644
--- a/plugins/modules/ipagroup.py
+++ b/plugins/modules/ipagroup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipahbacrule.py b/plugins/modules/ipahbacrule.py
index 3547b95afc3e9eaa19d911caa9af8518bcc06a9b..4744acf75a934f2aa26423ec4fdf8a04f5795074 100644
--- a/plugins/modules/ipahbacrule.py
+++ b/plugins/modules/ipahbacrule.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipahbacsvc.py b/plugins/modules/ipahbacsvc.py
index 30e9fddec3496249dd305af338aa7556db64e432..59053e07b97ebc8851e0e945c53fb2900231a1b0 100644
--- a/plugins/modules/ipahbacsvc.py
+++ b/plugins/modules/ipahbacsvc.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipahbacsvcgroup.py b/plugins/modules/ipahbacsvcgroup.py
index 60f05d2de37e3bb5af4c76909aad3cc6757e8325..dc6d278022e1f20b7a557826b8e32f1784057c4f 100644
--- a/plugins/modules/ipahbacsvcgroup.py
+++ b/plugins/modules/ipahbacsvcgroup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipahost.py b/plugins/modules/ipahost.py
index aa94ccec1b3efdb0a77095b61752235e42d15eb9..e48325833d1418975c95dc55b094a387af8487d4 100644
--- a/plugins/modules/ipahost.py
+++ b/plugins/modules/ipahost.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
@@ -403,7 +406,7 @@ host:
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, \
encode_certificate, is_ipv4_addr, is_ipv6_addr, ipalib_errors
-import six
+from ansible.module_utils import six
if six.PY3:
unicode = str
@@ -436,7 +439,7 @@ def find_dnsrecord(module, name):
This function may raise ipalib_errors.NotFound in some cases,
and it should be handled by the caller.
"""
- domain_name = name[name.find(".")+1:]
+ domain_name = name[name.find(".") + 1:]
host_name = name[:name.find(".")]
_args = {
@@ -1228,7 +1231,7 @@ def main():
}])
if len(dnsrecord_a_add) > 0 or len(dnsrecord_aaaa_add) > 0:
- domain_name = name[name.find(".")+1:]
+ domain_name = name[name.find(".") + 1:]
host_name = name[:name.find(".")]
_args = {"idnsname": host_name}
@@ -1245,7 +1248,7 @@ def main():
"dnsrecord_add", _args])
if len(dnsrecord_a_del) > 0 or len(dnsrecord_aaaa_del) > 0:
- domain_name = name[name.find(".")+1:]
+ domain_name = name[name.find(".") + 1:]
host_name = name[:name.find(".")]
# There seems to be an issue with dnsrecord_del (not
@@ -1361,7 +1364,7 @@ def main():
if "arecord" in dnsrecord_args or \
"aaaarecord" in dnsrecord_args:
- domain_name = name[name.find(".")+1:]
+ domain_name = name[name.find(".") + 1:]
host_name = name[:name.find(".")]
dnsrecord_args["idnsname"] = host_name
diff --git a/plugins/modules/ipahostgroup.py b/plugins/modules/ipahostgroup.py
index cf9ce90c7b1e1fcfcc41926ff7614d9d4707e9da..285fe51d713b38c1acacc9eaf04ceb73a743c969 100644
--- a/plugins/modules/ipahostgroup.py
+++ b/plugins/modules/ipahostgroup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipalocation.py b/plugins/modules/ipalocation.py
index 9b017cd03cbb0b2b0cc5dc6328cc8acb9c6f9211..0b7feadc34d8d71911735f189bb906f5745bef86 100644
--- a/plugins/modules/ipalocation.py
+++ b/plugins/modules/ipalocation.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipapermission.py b/plugins/modules/ipapermission.py
index b10161336428a65cfb328ca35a6b4857d49eef8c..2624a25e58a2524a8558d371383817e3be72d4bb 100644
--- a/plugins/modules/ipapermission.py
+++ b/plugins/modules/ipapermission.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipaprivilege.py b/plugins/modules/ipaprivilege.py
index 6856b1a625eea3d650f8973095191e0def2a4f3e..45abe6469028b71d9896991958bb0b7074dfbb69 100644
--- a/plugins/modules/ipaprivilege.py
+++ b/plugins/modules/ipaprivilege.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
"""ansible-freeipa module to manage FreeIPA privileges."""
@@ -110,7 +113,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
gen_intersection_list
-import six
+from ansible.module_utils import six
if six.PY3:
unicode = str
diff --git a/plugins/modules/ipapwpolicy.py b/plugins/modules/ipapwpolicy.py
index 6f1fd06c82c215c0ee9b8baca9bd3f1fcaac0928..7746b10c2adeacb262c6bee0f3c8727c3e57c387 100644
--- a/plugins/modules/ipapwpolicy.py
+++ b/plugins/modules/ipapwpolicy.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/iparole.py b/plugins/modules/iparole.py
index 63d674fd59afeea1346de39a3e847c57ca217414..912cfc1e8dcb52610f703a81cf7a1f1332f57d36 100644
--- a/plugins/modules/iparole.py
+++ b/plugins/modules/iparole.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
"""ansible-freeipa iparole module implementation."""
@@ -21,6 +20,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
@@ -101,7 +104,7 @@ EXAMPLES = """
from ansible.module_utils._text import to_text
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, gen_add_del_lists, compare_args_ipa
-import six
+from ansible.module_utils import six
if six.PY3:
diff --git a/plugins/modules/ipaselfservice.py b/plugins/modules/ipaselfservice.py
index 7bd26aff52142080323be644e41474126b4c1750..cc6ca6bdb2d2e74943e399b11cafad3b2e5c7563 100644
--- a/plugins/modules/ipaselfservice.py
+++ b/plugins/modules/ipaselfservice.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipaserver.py b/plugins/modules/ipaserver.py
index ac52ca18d8e4ae5567fe60be134c409a9479cc99..e80e706ad41c37a39979b2ab394ad8ca2c70f2be 100644
--- a/plugins/modules/ipaserver.py
+++ b/plugins/modules/ipaserver.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipaservice.py b/plugins/modules/ipaservice.py
index 3f30bd23aa0bae6938a1c26bb6bd18f3a272abd5..d1623c932d6fcb9870ca57580d8c70c03c51e1d0 100644
--- a/plugins/modules/ipaservice.py
+++ b/plugins/modules/ipaservice.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
@@ -183,21 +186,23 @@ EXAMPLES = """
ipaadmin_password: SomeADMINpassword
name: HTTP/www.example.com
certificate:
- - MIIC/zCCAeegAwIBAgIUMNHIbn+hhrOVew/2WbkteisV29QwDQYJKoZIhvcNAQELBQAw
- DzENMAsGA1UEAwwEdGVzdDAeFw0yMDAyMDQxNDQxMDhaFw0zMDAyMDExNDQxMDhaMA8xDT
- ALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+XVVGFYpH
- VkcDfVnNInE1Y/pFciegdzqTjMwUWlRL4Zt3u96GhaMLRbtk+OfEkzLUAhWBOwEraELJzM
- LJOMvjYF3C+TiGO7dStFLikZmccuSsSIXjnzIPwBXa8KvgRVRyGLoVvGbLJvmjfMXp0nIT
- oTx/i74KF9S++WEes9H5ErJ99CDhLKFgq0amnvsgparYXhypHaRLnikn0vQINt55YoEd1s
- 4KrvEcD2VdZkIMPbLRu2zFvMprF3cjQQG4LT9ggfEXNIPZ1nQWAnAsu7OJEkNF+E4Mkmpc
- xj9aGUVt5bsq1D+Tzj3GsidSX0nSNcZ2JltXRnL/5v63g5cZyE+nAgMBAAGjUzBRMB0GA1
- UdDgQWBBRV0j7JYukuH/r/t9+QeNlRLXDlEDAfBgNVHSMEGDAWgBRV0j7JYukuH/r/t9+Q
- eNlRLXDlEDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCgVy1+1kNwHs
- 5y1Zp0WjMWGCJC6/zw7FDG4OW5r2GJiCXZYdJ0UonY9ZtoVLJPrp2/DAv1m5DtnDhBYqic
- uPgLzEkOS1KdTi20Otm/J4yxLLrZC5W4x0XOeSVPXOJuQWfwQ5pPvKkn6WxYUYkGwIt1OH
- 2nSMngkbami3CbSmKZOCpgQIiSlQeDJ8oGjWFMLDymYSHoVOIXHwNoooyEiaio3693l6no
- obyGv49zyCVLVR1DC7i6RJ186ql0av+D4vPoiF5mX7+sKC2E8xEj9uKQ5GTWRh59VnRBVC
- /SiMJ/H78tJnBAvoBwXxSEvj8Z3Kjm/BQqZfv4IBsA5yqV7MVq
+ - >
+ MIIC/zCCAeegAwIBAgIUMNHIbn+hhrOVew/2WbkteisV29QwDQYJKoZIhvcNAQELBQAw
+ DzENMAsGA1UEAwwEdGVzdDAeFw0yMDAyMDQxNDQxMDhaFw0zMDAyMDExNDQxMDhaMA8x
+ DTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+XVVG
+ FYpHVkcDfVnNInE1Y/pFciegdzqTjMwUWlRL4Zt3u96GhaMLRbtk+OfEkzLUAhWBOwEr
+ aELJzMLJOMvjYF3C+TiGO7dStFLikZmccuSsSIXjnzIPwBXa8KvgRVRyGLoVvGbLJvmj
+ fMXp0nIToTx/i74KF9S++WEes9H5ErJ99CDhLKFgq0amnvsgparYXhypHaRLnikn0vQI
+ Nt55YoEd1s4KrvEcD2VdZkIMPbLRu2zFvMprF3cjQQG4LT9ggfEXNIPZ1nQWAnAsu7OJ
+ EkNF+E4Mkmpcxj9aGUVt5bsq1D+Tzj3GsidSX0nSNcZ2JltXRnL/5v63g5cZyE+nAgMB
+ AAGjUzBRMB0GA1UdDgQWBBRV0j7JYukuH/r/t9+QeNlRLXDlEDAfBgNVHSMEGDAWgBRV
+ 0j7JYukuH/r/t9+QeNlRLXDlEDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA
+ A4IBAQCgVy1+1kNwHs5y1Zp0WjMWGCJC6/zw7FDG4OW5r2GJiCXZYdJ0UonY9ZtoVLJP
+ rp2/DAv1m5DtnDhBYqicuPgLzEkOS1KdTi20Otm/J4yxLLrZC5W4x0XOeSVPXOJuQWfw
+ Q5pPvKkn6WxYUYkGwIt1OH2nSMngkbami3CbSmKZOCpgQIiSlQeDJ8oGjWFMLDymYSHo
+ VOIXHwNoooyEiaio3693l6noobyGv49zyCVLVR1DC7i6RJ186ql0av+D4vPoiF5mX7+s
+ KC2E8xEj9uKQ5GTWRh59VnRBVC/SiMJ/H78tJnBAvoBwXxSEvj8Z3Kjm/BQqZfv4IBsA
+ 5yqV7MVq
action: member
state: present
@@ -285,7 +290,8 @@ def gen_args_smb(netbiosname, ok_as_delegate, ok_to_auth_as_delegate):
def check_parameters(module, state, action, names, parameters):
- assert isinstance(parameters, dict)
+ if not isinstance(parameters, dict):
+ raise AssertionError("parameters is not a dict")
# invalid parameters for everything but state 'present', action 'service'.
invalid = ['pac_type', 'auth_ind', 'skip_host_check',
diff --git a/plugins/modules/ipasudocmd.py b/plugins/modules/ipasudocmd.py
index 614f45b41ff53dcff7b06f9bf51fc358cfce0ad5..1008907385452a817d679f4c4bec4de2055cfa05 100644
--- a/plugins/modules/ipasudocmd.py
+++ b/plugins/modules/ipasudocmd.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipasudocmdgroup.py b/plugins/modules/ipasudocmdgroup.py
index 42f29fb87035a4f4c494235cbe6659157121a02a..118dea001c87ed4bd7a991128d9b7e3207db487e 100644
--- a/plugins/modules/ipasudocmdgroup.py
+++ b/plugins/modules/ipasudocmdgroup.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipasudorule.py b/plugins/modules/ipasudorule.py
index d5a459a898d33f25e6ef059ae997a8136ae45c8a..27a99abafe968cbf85f324d1364b517327171bbc 100644
--- a/plugins/modules/ipasudorule.py
+++ b/plugins/modules/ipasudorule.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipatopologysegment.py b/plugins/modules/ipatopologysegment.py
index e8ef2b0a9d19af8e8acaf7b96b4c68007afe8efa..616fc5f7604cedb7dd73b88a94b2f8e1ac0ba8bc 100644
--- a/plugins/modules/ipatopologysegment.py
+++ b/plugins/modules/ipatopologysegment.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipatopologysuffix.py b/plugins/modules/ipatopologysuffix.py
index c5be3d3e025e46e6174b2f6a9328724fcc538e3f..9845eb7bd238f0346f2a89a83c68c355cdae2f4a 100644
--- a/plugins/modules/ipatopologysuffix.py
+++ b/plugins/modules/ipatopologysuffix.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/plugins/modules/ipatrust.py b/plugins/modules/ipatrust.py
index 0d9036ebfb60216f54c57aea0f911d8437e29ac6..6251ecc8219f8598f48823a78fcc10c462151c21 100644
--- a/plugins/modules/ipatrust.py
+++ b/plugins/modules/ipatrust.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {'metadata_version': '1.1',
'supported_by': 'community',
'status': ['preview'],
diff --git a/plugins/modules/ipauser.py b/plugins/modules/ipauser.py
index f88e8d8fc7fb971f057250af391469d5ee56291d..b737f74971aed62a2cd4fb4b0405a4e4061cb86c 100644
--- a/plugins/modules/ipauser.py
+++ b/plugins/modules/ipauser.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
@@ -472,7 +475,7 @@ user:
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, date_format, \
encode_certificate, load_cert_from_str, DN_x500_text, to_text
-import six
+from ansible.module_utils import six
if six.PY3:
unicode = str
@@ -696,8 +699,8 @@ def check_certmapdata(data):
i = data.find("<I>", 4)
s = data.find("<S>", i) # pylint: disable=invalid-name
- issuer = data[i+3:s]
- subject = data[s+3:]
+ issuer = data[i + 3:s]
+ subject = data[s + 3:]
if i < 0 or s < 0 or "CN" not in issuer or "CN" not in subject:
return False
diff --git a/plugins/modules/ipavault.py b/plugins/modules/ipavault.py
index 0274b705fb9df4a010cc2ba41010511586740593..76d3ae2d77248bdf1419ba054ce09823ac9ac4e7 100644
--- a/plugins/modules/ipavault.py
+++ b/plugins/modules/ipavault.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
diff --git a/roles/ipabackup/library/ipabackup_get_backup_dir.py b/roles/ipabackup/library/ipabackup_get_backup_dir.py
index b76d01d44a8bc5f56ca171fa34d9c1fbab689fff..d9eeb51231e13cb6aa958299b59af43f18c30401 100644
--- a/roles/ipabackup/library/ipabackup_get_backup_dir.py
+++ b/roles/ipabackup/library/ipabackup_get_backup_dir.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
@@ -40,7 +43,8 @@ author:
EXAMPLES = '''
# Get IPA_BACKUP_DIR from ipaplatform
-- name: ipabackup_get_backup_dir:
+- name: Get IPA_BACKUP_DIR from ipaplatform
+ ipabackup_get_backup_dir:
register result
'''
diff --git a/roles/ipaclient/action_plugins/ipaclient_get_otp.py b/roles/ipaclient/action_plugins/ipaclient_get_otp.py
index 8e04ad99873e2e39d20da6caa76107552b9b6874..c7a26462c78b2b5efa2d540aa9b41d161704234f 100644
--- a/roles/ipaclient/action_plugins/ipaclient_get_otp.py
+++ b/roles/ipaclient/action_plugins/ipaclient_get_otp.py
@@ -17,6 +17,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
try:
import gssapi
except ImportError:
diff --git a/roles/ipaclient/library/ipaclient_api.py b/roles/ipaclient/library/ipaclient_api.py
index 865438f3e3e9425039bf33acd5409551a5bb666e..908f538d23445d2c18c808e6a72b21b58ed1deb1 100644
--- a/roles/ipaclient/library/ipaclient_api.py
+++ b/roles/ipaclient/library/ipaclient_api.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {'metadata_version': '1.0',
'status': ['preview'],
'supported_by': 'community'}
diff --git a/roles/ipaclient/library/ipaclient_fix_ca.py b/roles/ipaclient/library/ipaclient_fix_ca.py
index 858edc280dce8d2d8f6d55c977cd7e6f63908957..799920a5f102a77bbb6a5e7a714564069d70832c 100644
--- a/roles/ipaclient/library/ipaclient_fix_ca.py
+++ b/roles/ipaclient/library/ipaclient_fix_ca.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {'metadata_version': '1.0',
'status': ['preview'],
'supported_by': 'community'}
diff --git a/roles/ipaclient/library/ipaclient_fstore.py b/roles/ipaclient/library/ipaclient_fstore.py
index 4c34296057c8781b99a77f16ac305ae1563cf456..f05c35b38edfa0ac058408477faad78243f98ad9 100644
--- a/roles/ipaclient/library/ipaclient_fstore.py
+++ b/roles/ipaclient/library/ipaclient_fstore.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_get_facts.py b/roles/ipaclient/library/ipaclient_get_facts.py
index b7e270fc3f0b66be9beecb6bd6955bfcd2bc8e96..1a2b331c854c072371d75eee85249be079278cf0 100644
--- a/roles/ipaclient/library/ipaclient_get_facts.py
+++ b/roles/ipaclient/library/ipaclient_get_facts.py
@@ -1,6 +1,9 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
DOCUMENTATION = """
---
module: ipaclient_get_facts
@@ -12,9 +15,9 @@ author:
import os
import re
-import six
+from ansible.module_utils import six
try:
- from six.moves.configparser import RawConfigParser
+ from ansible.module_utils.six.moves.configparser import RawConfigParser
except ImportError:
from ConfigParser import RawConfigParser
@@ -81,7 +84,8 @@ def is_dogtag_configured(subsystem):
# ca / kra is configured when the directory
# /var/lib/pki/pki-tomcat/[ca|kra] # exists
available_subsystems = {'ca', 'kra'}
- assert subsystem in available_subsystems
+ if subsystem not in available_subsystems:
+ raise AssertionError("Subsystem '%s' not available" % subsystem)
return os.path.isdir(os.path.join(VAR_LIB_PKI_TOMCAT, subsystem))
@@ -120,7 +124,7 @@ def get_ipa_conf():
basedn=basedn,
realm=realm,
domain=domain
- )
+ )
def get_ipa_version():
@@ -147,7 +151,7 @@ def get_ipa_version():
vendor_version=version.VENDOR_VERSION,
version=version.VERSION,
version_info=version_info
- )
+ )
def main():
@@ -193,7 +197,7 @@ def main():
module.exit_json(
changed=False,
ansible_facts=dict(ipa=facts)
- )
+ )
if __name__ == '__main__':
diff --git a/roles/ipaclient/library/ipaclient_get_otp.py b/roles/ipaclient/library/ipaclient_get_otp.py
index 03e8b2b08cb18e80806bf7c12d1782835efdf9ff..1ae05ea8861b68351db36097b08ea5624da764b1 100644
--- a/roles/ipaclient/library/ipaclient_get_otp.py
+++ b/roles/ipaclient/library/ipaclient_get_otp.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {'metadata_version': '1.0',
'status': ['preview'],
'supported_by': 'community'}
@@ -121,9 +124,9 @@ host:
'''
import os
-import six
from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils import six
from ipalib import api, errors
from ipaplatform.paths import paths
diff --git a/roles/ipaclient/library/ipaclient_ipa_conf.py b/roles/ipaclient/library/ipaclient_ipa_conf.py
index ac31e01f7aecadbfb8984353dd4d7e562df3a2db..36a41d832b1c22a321364ae7d163c71671133aca 100644
--- a/roles/ipaclient/library/ipaclient_ipa_conf.py
+++ b/roles/ipaclient/library/ipaclient_ipa_conf.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_join.py b/roles/ipaclient/library/ipaclient_join.py
index b67be37056133e0ce4e75702f26d298c6950458f..2c72a6a6473204e916ea7abc3593f82c9f62152b 100644
--- a/roles/ipaclient/library/ipaclient_join.py
+++ b/roles/ipaclient/library/ipaclient_join.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
@@ -179,7 +182,7 @@ def main():
if password is None and admin_keytab is None:
module.fail_json(msg="Password or admin_keytab is needed")
- client_domain = hostname[hostname.find(".")+1:]
+ client_domain = hostname[hostname.find(".") + 1:]
nolog = tuple()
env = {'PATH': SECURE_PATH}
fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
diff --git a/roles/ipaclient/library/ipaclient_set_hostname.py b/roles/ipaclient/library/ipaclient_set_hostname.py
index 4145df9a7b1f95fed136cd8f22517985a0c18e8d..3b57d9ae6dcad0f2578b71fb0945d432631b3a39 100644
--- a/roles/ipaclient/library/ipaclient_set_hostname.py
+++ b/roles/ipaclient/library/ipaclient_set_hostname.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_automount.py b/roles/ipaclient/library/ipaclient_setup_automount.py
index 1fda9ba09d50592693a1901339b16369fd3c80a3..6ff12bf43cbee8fb0bf7de552b6c8e74231e812a 100644
--- a/roles/ipaclient/library/ipaclient_setup_automount.py
+++ b/roles/ipaclient/library/ipaclient_setup_automount.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_firefox.py b/roles/ipaclient/library/ipaclient_setup_firefox.py
index 7095692e4bef31b4e21d5aaa9f236f5ba1de3c57..69fccc58ad67c372708b5c139efa7d0ab7fab474 100644
--- a/roles/ipaclient/library/ipaclient_setup_firefox.py
+++ b/roles/ipaclient/library/ipaclient_setup_firefox.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_krb5.py b/roles/ipaclient/library/ipaclient_setup_krb5.py
index 9eb3e94873e9032252f47973f1d34abce83caa9f..48c42d00774c891d38e99fdf6a792b9ca4919061 100644
--- a/roles/ipaclient/library/ipaclient_setup_krb5.py
+++ b/roles/ipaclient/library/ipaclient_setup_krb5.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_nis.py b/roles/ipaclient/library/ipaclient_setup_nis.py
index e04b87c671921ffa05d461a6834679e5a91a9bec..c95aadaa49d1025b7ec1e29888fa39226239b7b5 100644
--- a/roles/ipaclient/library/ipaclient_setup_nis.py
+++ b/roles/ipaclient/library/ipaclient_setup_nis.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_nss.py b/roles/ipaclient/library/ipaclient_setup_nss.py
index d829a56b8e28a1b4cde675b2374f7dc7451cb965..8d1dccae556c4e942e927e1eb59d9d09785d4273 100644
--- a/roles/ipaclient/library/ipaclient_setup_nss.py
+++ b/roles/ipaclient/library/ipaclient_setup_nss.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_ntp.py b/roles/ipaclient/library/ipaclient_setup_ntp.py
index b41a910b17d9720edb737c512b3f053c0190ebd2..b95f2f24593df91309a1ce4f602e27fe5aa4ce29 100644
--- a/roles/ipaclient/library/ipaclient_setup_ntp.py
+++ b/roles/ipaclient/library/ipaclient_setup_ntp.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_ssh.py b/roles/ipaclient/library/ipaclient_setup_ssh.py
index f721b2a28be4ffd30eceec48ee8f492561286bae..11ea652cdac7096da37f45433160a03bfa4e8e64 100644
--- a/roles/ipaclient/library/ipaclient_setup_ssh.py
+++ b/roles/ipaclient/library/ipaclient_setup_ssh.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaclient/library/ipaclient_setup_sssd.py b/roles/ipaclient/library/ipaclient_setup_sssd.py
index 3fd767fca0f6640432b2a11369a313e883c35802..5d2f520cd14dbc5a53ec2ab1a293455523c11607 100644
--- a/roles/ipaclient/library/ipaclient_setup_sssd.py
+++ b/roles/ipaclient/library/ipaclient_setup_sssd.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
@@ -156,7 +159,7 @@ def main():
options.krb5_offline_passwords = not options.no_krb5_offline_passwords
fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
- client_domain = hostname[hostname.find(".")+1:]
+ client_domain = hostname[hostname.find(".") + 1:]
if configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server,
options, client_domain, hostname):
diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index 84c8f0a498601b85bc7903e8b082b43c38ef1feb..540daba423de4721755a82d629187df7d39c0b65 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/roles/ipaclient/library/ipaclient_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
@@ -197,7 +200,7 @@ import socket
import inspect
try:
- from six.moves.configparser import RawConfigParser
+ from ansible.module_utils.six.moves.configparser import RawConfigParser
except ImportError:
from ConfigParser import RawConfigParser
@@ -319,7 +322,7 @@ def main():
if options.domain_name is None and options.servers is not None:
if len(options.servers) > 0:
options.domain_name = options.servers[0][
- options.servers[0].find(".")+1:]
+ options.servers[0].find(".") + 1:]
try:
self = options
@@ -701,7 +704,7 @@ def main():
cli_domain_source = ds.domain_source
logger.debug("will use discovered domain: %s", cli_domain)
- client_domain = hostname[hostname.find(".")+1:]
+ client_domain = hostname[hostname.find(".") + 1:]
if ret in (ipadiscovery.NO_LDAP_SERVER, ipadiscovery.NOT_IPA_SERVER) \
or not ds.server:
diff --git a/roles/ipaclient/library/ipaclient_test_keytab.py b/roles/ipaclient/library/ipaclient_test_keytab.py
index 75ed10910fa0d8fe323c37ca136dd3fe4160616f..97a1ab798afd783e639f1bee8ca16e67ee8759c6 100644
--- a/roles/ipaclient/library/ipaclient_test_keytab.py
+++ b/roles/ipaclient/library/ipaclient_test_keytab.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
@@ -131,7 +134,7 @@ def main():
kdc = module.params.get('kdc')
kinit_attempts = module.params.get('kinit_attempts')
- client_domain = hostname[hostname.find(".")+1:]
+ client_domain = hostname[hostname.find(".") + 1:]
host_principal = 'host/%s@%s' % (hostname, realm)
sssd = True
diff --git a/roles/ipaclient/module_utils/ansible_ipa_client.py b/roles/ipaclient/module_utils/ansible_ipa_client.py
index 733375c93cc3a31b7f803ea7689be71cfd63fe86..8826b6d45023b5f10c0f7791cfa1eafb4edd7ea8 100644
--- a/roles/ipaclient/module_utils/ansible_ipa_client.py
+++ b/roles/ipaclient/module_utils/ansible_ipa_client.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
__all__ = ["gssapi", "version", "ipadiscovery", "api", "errors", "x509",
"constants", "sysrestore", "certmonger", "certstore",
"delete_persistent_client_session_data", "ScriptError",
@@ -60,7 +63,7 @@ else:
# See ipapython/version.py
IPA_MAJOR, IPA_MINOR, IPA_RELEASE = [int(x) for x in
VERSION.split(".", 2)]
- IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE
+ IPA_PYTHON_VERSION = IPA_MAJOR * 10000 + IPA_MINOR * 100 + IPA_RELEASE
else:
IPA_PYTHON_VERSION = NUM_VERSION
diff --git a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
index acd553b78191dc88d03d0c88cfb5103a65d2db07..2ec634cccf18fbf8bd504debf03d273f98dba094 100644
--- a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
+++ b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
@@ -63,7 +64,6 @@ RETURN = '''
'''
import os
-import six
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ansible_ipa_replica import (
@@ -72,6 +72,8 @@ from ansible.module_utils.ansible_ipa_replica import (
gen_remote_api, api
)
+from ansible.module_utils import six
+
if six.PY3:
unicode = str
diff --git a/roles/ipareplica/library/ipareplica_create_ipa_conf.py b/roles/ipareplica/library/ipareplica_create_ipa_conf.py
index c475469f5526d3d1ca905710579b1cd192ab16fd..e75f150ebafdffde170eb9e327a3c022446ad83b 100644
--- a/roles/ipareplica/library/ipareplica_create_ipa_conf.py
+++ b/roles/ipareplica/library/ipareplica_create_ipa_conf.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
index c580ed5fbf2bcaa3be3e53084e975088c0b211d0..6199e50a5db3f38c63794be69c1a81dcee5eb2ef 100644
--- a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
+++ b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_ds_apply_updates.py b/roles/ipareplica/library/ipareplica_ds_apply_updates.py
index 71008b323c614296be61bda43fc8f3e42f86e161..3d2fc97bb1be75e0b33f1fe9c8dc7408d77ae114 100644
--- a/roles/ipareplica/library/ipareplica_ds_apply_updates.py
+++ b/roles/ipareplica/library/ipareplica_ds_apply_updates.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
index 3e4090d884f750db3bd4d20b90f0b4cdc1a2bcf4..93f88f622d5ce50f2032b7868528502af00ff574 100644
--- a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
+++ b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_enable_ipa.py b/roles/ipareplica/library/ipareplica_enable_ipa.py
index d18552b5656be92d9544d0a7e463a5e6c5544051..da79154e7b0c163d330dab5409ecfc54c2c2ff16 100644
--- a/roles/ipareplica/library/ipareplica_enable_ipa.py
+++ b/roles/ipareplica/library/ipareplica_enable_ipa.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_install_ca_certs.py b/roles/ipareplica/library/ipareplica_install_ca_certs.py
index b93f0b9a77c79b987d3a8540f96a1fd5ea70621b..72d28080f48e977bc6ec7d22b4803c2e534aacf9 100644
--- a/roles/ipareplica/library/ipareplica_install_ca_certs.py
+++ b/roles/ipareplica/library/ipareplica_install_ca_certs.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
index a302b0faf4949746470eb34b354097d47af32334..5fcd5c8c2680ddd3f9ebe2a902d6fb037106ac2d 100644
--- a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
+++ b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_master_password.py b/roles/ipareplica/library/ipareplica_master_password.py
index 02f9fd1505a0978ea1956dcc61e94d5b6c0960f3..1b3f1b0808aeaca393eb5fbb478ddb517483a1fb 100644
--- a/roles/ipareplica/library/ipareplica_master_password.py
+++ b/roles/ipareplica/library/ipareplica_master_password.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipareplica/library/ipareplica_prepare.py b/roles/ipareplica/library/ipareplica_prepare.py
index 8adc46cb7ecc3ba026a53ff3d4784b38be218d64..a78629d2ccff173da6581e6ac98354c44a25d885 100644
--- a/roles/ipareplica/library/ipareplica_prepare.py
+++ b/roles/ipareplica/library/ipareplica_prepare.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
@@ -194,7 +195,6 @@ RETURN = '''
import os
import tempfile
import traceback
-import six
from shutil import copyfile
from ansible.module_utils.basic import AnsibleModule
@@ -209,6 +209,7 @@ from ansible.module_utils.ansible_ipa_replica import (
dns, no_matching_interface_for_ip_address_warning, adtrust,
constants, api, redirect_stdout, replica_conn_check, tasks
)
+from ansible.module_utils import six
if six.PY3:
unicode = str
diff --git a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
index 207794ced2c1fd86e0c6f4f5207afec3158360bc..9d847fdecea87680ebc66452e70d3b4b10466c72 100644
--- a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
+++ b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_promote_sssd.py b/roles/ipareplica/library/ipareplica_promote_sssd.py
index 66d84d0d0be441372b50f39764ae009b2d12cbf5..da490b8f757f26d5dcf31ee9ed595a4906d5c41b 100644
--- a/roles/ipareplica/library/ipareplica_promote_sssd.py
+++ b/roles/ipareplica/library/ipareplica_promote_sssd.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_restart_kdc.py b/roles/ipareplica/library/ipareplica_restart_kdc.py
index b9c990060e51a127af2430eae9fd64bd581a15f9..48d4667819d459f5365c07f0aa7af3104e3e151b 100644
--- a/roles/ipareplica/library/ipareplica_restart_kdc.py
+++ b/roles/ipareplica/library/ipareplica_restart_kdc.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_adtrust.py b/roles/ipareplica/library/ipareplica_setup_adtrust.py
index 734e56d6e5bb9ee7eb397e6b49263e108593d6be..0c99a28587648e844d1b50cb00589f04b19adcbf 100644
--- a/roles/ipareplica/library/ipareplica_setup_adtrust.py
+++ b/roles/ipareplica/library/ipareplica_setup_adtrust.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_ca.py b/roles/ipareplica/library/ipareplica_setup_ca.py
index d71299b6754fce6cf7aae7f907526c4c86a1c30d..18aedd3d76e06b08b3c21614448832febf24be90 100644
--- a/roles/ipareplica/library/ipareplica_setup_ca.py
+++ b/roles/ipareplica/library/ipareplica_setup_ca.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_certmonger.py b/roles/ipareplica/library/ipareplica_setup_certmonger.py
index 982aab0a56a0f6bcc2f2848f52ea064f26b829c1..a04e5f1abc1fd9a1fe1adbbc87d41b3aca81db00 100644
--- a/roles/ipareplica/library/ipareplica_setup_certmonger.py
+++ b/roles/ipareplica/library/ipareplica_setup_certmonger.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_custodia.py b/roles/ipareplica/library/ipareplica_setup_custodia.py
index 2e95c2628c732d01e13fca4d14cfde31be47cda2..825f756f53ac50f36cccc99377006963183e4d3f 100644
--- a/roles/ipareplica/library/ipareplica_setup_custodia.py
+++ b/roles/ipareplica/library/ipareplica_setup_custodia.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_dns.py b/roles/ipareplica/library/ipareplica_setup_dns.py
index 51ab749db569f9546fec57c0404a511ab7349660..31d219f3f538b254904e76de4d5f6b591ba39151 100644
--- a/roles/ipareplica/library/ipareplica_setup_dns.py
+++ b/roles/ipareplica/library/ipareplica_setup_dns.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_ds.py b/roles/ipareplica/library/ipareplica_setup_ds.py
index 8a44120b4634cc5dc4f39dbc85898a7b694f9e8d..22427873cecec12e673afb39053da962d24c0737 100644
--- a/roles/ipareplica/library/ipareplica_setup_ds.py
+++ b/roles/ipareplica/library/ipareplica_setup_ds.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_http.py b/roles/ipareplica/library/ipareplica_setup_http.py
index 3fa480701d1ba63c84ff236a6f1eb3817388aca0..8df3b699ae013bdc8ac39edac3d63a81213f8573 100644
--- a/roles/ipareplica/library/ipareplica_setup_http.py
+++ b/roles/ipareplica/library/ipareplica_setup_http.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_kra.py b/roles/ipareplica/library/ipareplica_setup_kra.py
index 0b2f681a270676b385fa7987082bd72a3a566676..5758ac227dfe9620e2734a52ffdb5f9f180b1564 100644
--- a/roles/ipareplica/library/ipareplica_setup_kra.py
+++ b/roles/ipareplica/library/ipareplica_setup_kra.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_krb.py b/roles/ipareplica/library/ipareplica_setup_krb.py
index 4500a6febb070c43c50c57faf513c7dc2177d837..ee7720178a97f9f85754e21a3f49c1aaa83339f7 100644
--- a/roles/ipareplica/library/ipareplica_setup_krb.py
+++ b/roles/ipareplica/library/ipareplica_setup_krb.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_setup_otpd.py b/roles/ipareplica/library/ipareplica_setup_otpd.py
index 1b8117d8e3210e8cc4a5a6a5ca7097622a4c7d39..8d8aedbebb69e065e8885c1b81a34f169399ec3e 100644
--- a/roles/ipareplica/library/ipareplica_setup_otpd.py
+++ b/roles/ipareplica/library/ipareplica_setup_otpd.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipareplica/library/ipareplica_test.py b/roles/ipareplica/library/ipareplica_test.py
index 217e29c8136f3440a576ddfc18a2e26954b39f98..784136d2fd3a6d74a44fbd6c074b0f82a0b4c8ff 100644
--- a/roles/ipareplica/library/ipareplica_test.py
+++ b/roles/ipareplica/library/ipareplica_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
@@ -249,7 +252,8 @@ def main():
# If not defined, set domain from server name
if installer.domain_name is None and installer.server is not None:
- installer.domain_name = installer.server[installer.server.find(".")+1:]
+ installer.domain_name = \
+ installer.server[installer.server.find(".") + 1:]
# If not defined, set realm from domain name
if installer.realm_name is None and installer.domain_name is not None:
installer.realm_name = installer.domain_name.upper()
diff --git a/roles/ipareplica/module_utils/ansible_ipa_replica.py b/roles/ipareplica/module_utils/ansible_ipa_replica.py
index 1de75e1a46576fa882476ffe573240533d36edf0..464a43fcc3c7b53ede76653a44f39f173ee1aa4b 100644
--- a/roles/ipareplica/module_utils/ansible_ipa_replica.py
+++ b/roles/ipareplica/module_utils/ansible_ipa_replica.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
__all__ = ["contextlib", "dnsexception", "dnsresolver", "dnsreversename",
"parse_version", "IPAChangeConf",
"certstore", "sysrestore", "ipa_generate_password", "kinit_keytab",
@@ -62,7 +65,7 @@ else:
# See ipapython/version.py
IPA_MAJOR, IPA_MINOR, IPA_RELEASE = [int(x) for x in
VERSION.split(".", 2)]
- IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE
+ IPA_PYTHON_VERSION = IPA_MAJOR * 10000 + IPA_MINOR * 100 + IPA_RELEASE
else:
IPA_PYTHON_VERSION = NUM_VERSION
diff --git a/roles/ipaserver/library/ipaserver_enable_ipa.py b/roles/ipaserver/library/ipaserver_enable_ipa.py
index 00bf3da60d7648045d678bbdc2a48341e886968f..d1333d5fd0fd048a2910b58d59989dfd957abd70 100644
--- a/roles/ipaserver/library/ipaserver_enable_ipa.py
+++ b/roles/ipaserver/library/ipaserver_enable_ipa.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_load_cache.py b/roles/ipaserver/library/ipaserver_load_cache.py
index ad29455c79391269babae87b4a120c3cf68aed75..e93567b518453779152a630aa3b8f7b33da3e799 100644
--- a/roles/ipaserver/library/ipaserver_load_cache.py
+++ b/roles/ipaserver/library/ipaserver_load_cache.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_master_password.py b/roles/ipaserver/library/ipaserver_master_password.py
index bf9c52b0fbbe1d1bf9de413d0f71cd3a3dd73839..8d26cac42f00fc5f24c90ceb35195c08752160e3 100644
--- a/roles/ipaserver/library/ipaserver_master_password.py
+++ b/roles/ipaserver/library/ipaserver_master_password.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
diff --git a/roles/ipaserver/library/ipaserver_prepare.py b/roles/ipaserver/library/ipaserver_prepare.py
index 1341abfbd8555149bf5e34de91ba0ddc33bbf44f..b3d3b483765acdb20ce2423cf8af5b48d2017f44 100644
--- a/roles/ipaserver/library/ipaserver_prepare.py
+++ b/roles/ipaserver/library/ipaserver_prepare.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_set_ds_password.py b/roles/ipaserver/library/ipaserver_set_ds_password.py
index 4b5b3b35ee3994aca8d69dc609bd82af16e4e309..283e093a73895081e4db8b7428508f25fde6a91c 100644
--- a/roles/ipaserver/library/ipaserver_set_ds_password.py
+++ b/roles/ipaserver/library/ipaserver_set_ds_password.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_adtrust.py b/roles/ipaserver/library/ipaserver_setup_adtrust.py
index 341cb4e2a651fa6b5e55497dc950a59151621218..de15ef49b1a08ff74d8f8766a3f1e1edc7ac1199 100644
--- a/roles/ipaserver/library/ipaserver_setup_adtrust.py
+++ b/roles/ipaserver/library/ipaserver_setup_adtrust.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_ca.py b/roles/ipaserver/library/ipaserver_setup_ca.py
index 53a3633a55a1a41b495cc120a387e2ec79417300..fb185ac23c075fdc8d624604810b87d00d393beb 100644
--- a/roles/ipaserver/library/ipaserver_setup_ca.py
+++ b/roles/ipaserver/library/ipaserver_setup_ca.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_custodia.py b/roles/ipaserver/library/ipaserver_setup_custodia.py
index 565020b83981d06ff593b761a778b2246610626b..b0b98cc418f98989e800cba1bc725114466a8b8b 100644
--- a/roles/ipaserver/library/ipaserver_setup_custodia.py
+++ b/roles/ipaserver/library/ipaserver_setup_custodia.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_dns.py b/roles/ipaserver/library/ipaserver_setup_dns.py
index 396b43948ec2c8f55250d301854989e73f5be074..eba94e50645b8dfe39b412938f4c18b079e156ee 100644
--- a/roles/ipaserver/library/ipaserver_setup_dns.py
+++ b/roles/ipaserver/library/ipaserver_setup_dns.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_ds.py b/roles/ipaserver/library/ipaserver_setup_ds.py
index 3fc9d50ad2ceb3a6ba02d4f232b3021f97395346..602ec9ea84543393b68c35d09e0e87b9916e49a5 100644
--- a/roles/ipaserver/library/ipaserver_setup_ds.py
+++ b/roles/ipaserver/library/ipaserver_setup_ds.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_http.py b/roles/ipaserver/library/ipaserver_setup_http.py
index 4d9a54d6585f634c6850b5af321e1b85434da6fa..350f39b59c7f5207e65d2dd7f09ed74f48f0cbad 100644
--- a/roles/ipaserver/library/ipaserver_setup_http.py
+++ b/roles/ipaserver/library/ipaserver_setup_http.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_kra.py b/roles/ipaserver/library/ipaserver_setup_kra.py
index 5296c09efc7ca1db061f498d2b945b5067b75f6e..6ca32953266956a5d8206fc6e277c076bd8db901 100644
--- a/roles/ipaserver/library/ipaserver_setup_kra.py
+++ b/roles/ipaserver/library/ipaserver_setup_kra.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_krb.py b/roles/ipaserver/library/ipaserver_setup_krb.py
index 1101d8d0cdf178583857b5deadac5179abccd351..6cddbc83d2059c377ff2e5fbfbe12f8d80298a2a 100644
--- a/roles/ipaserver/library/ipaserver_setup_krb.py
+++ b/roles/ipaserver/library/ipaserver_setup_krb.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_ntp.py b/roles/ipaserver/library/ipaserver_setup_ntp.py
index ab1fde7ef0c4e99ab0b8968ecb14274ed5a295ba..9c37c23bcf76dc601d8654d6b2235ec458d3de58 100644
--- a/roles/ipaserver/library/ipaserver_setup_ntp.py
+++ b/roles/ipaserver/library/ipaserver_setup_ntp.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_setup_otpd.py b/roles/ipaserver/library/ipaserver_setup_otpd.py
index e72d27b51c92734caa297d0af928c995a8a9ed16..e1f9ce2ca437cbfeec3be231e6325a276ad7d681 100644
--- a/roles/ipaserver/library/ipaserver_setup_otpd.py
+++ b/roles/ipaserver/library/ipaserver_setup_otpd.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,7 +21,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-from __future__ import print_function
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
ANSIBLE_METADATA = {
'metadata_version': '1.0',
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 175a1e037dd0b28b3f5a7aa22704d68e552da5b3..4c7df49b3f448a53404a38c1257340bfa7616fc7 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
'metadata_version': '1.0',
'supported_by': 'community',
@@ -209,7 +212,6 @@ RETURN = '''
import os
import sys
-import six
import inspect
import random
from shutil import copyfile
@@ -226,6 +228,7 @@ from ansible.module_utils.ansible_ipa_server import (
validate_domain_name, load_pkcs12, IPA_PYTHON_VERSION,
encode_certificate, check_available_memory
)
+from ansible.module_utils import six
if six.PY3:
unicode = str
@@ -923,7 +926,7 @@ def main():
host_name = host_name.lower()
if not options.domain_name:
- domain_name = host_name[host_name.find(".")+1:]
+ domain_name = host_name[host_name.find(".") + 1:]
try:
validate_domain_name(domain_name)
except ValueError as e:
diff --git a/roles/ipaserver/module_utils/ansible_ipa_server.py b/roles/ipaserver/module_utils/ansible_ipa_server.py
index a5310f88c3ad89d081182a456e5fffde6d811645..dfb424a8bfaf6afe107c3a4b00ee036dfd70dd09 100644
--- a/roles/ipaserver/module_utils/ansible_ipa_server.py
+++ b/roles/ipaserver/module_utils/ansible_ipa_server.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -22,6 +21,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
__all__ = ["IPAChangeConf", "certmonger", "sysrestore", "root_logger",
"ipa_generate_password", "run", "ScriptError", "services",
"tasks", "errors", "x509", "DOMAIN_LEVEL_0", "MIN_DOMAIN_LEVEL",
@@ -52,7 +55,7 @@ else:
import logging
from contextlib import contextmanager as contextlib_contextmanager
- import six
+ from ansible.module_utils import six
import base64
from ipapython.version import NUM_VERSION, VERSION
@@ -61,7 +64,7 @@ else:
# See ipapython/version.py
IPA_MAJOR, IPA_MINOR, IPA_RELEASE = [int(x) for x in
VERSION.split(".", 2)]
- IPA_PYTHON_VERSION = IPA_MAJOR*10000 + IPA_MINOR*100 + IPA_RELEASE
+ IPA_PYTHON_VERSION = IPA_MAJOR * 10000 + IPA_MINOR * 100 + IPA_RELEASE
else:
IPA_PYTHON_VERSION = NUM_VERSION
diff --git a/setup.cfg b/setup.cfg
index 15acf37745cf69e95f1025823666dc6ce8e29b1f..2a6d8789856f4d35358cc032cfaf5f262acc2a46 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -57,7 +57,7 @@ disable =
fixme
[pylint.BASIC]
-good-names = ex, i, j, k, Run, _, e, x, dn, cn, ip, os, unicode
+good-names = ex, i, j, k, Run, _, e, x, dn, cn, ip, os, unicode, __metaclass__
[pylint.IMPORTS]
ignored-modules =
diff --git a/tests/ca-less/generate-certificates.sh b/tests/ca-less/generate-certificates.sh
index e96d323ae4a932883d2bc574d1e1cea3305d9b1e..c366e87d9e74dca89091cb32fcca76f427a820d7 100755
--- a/tests/ca-less/generate-certificates.sh
+++ b/tests/ca-less/generate-certificates.sh
@@ -21,36 +21,36 @@ function generate_ipa_pkcs12_certificate {
# Generate CSR and private key
openssl req -new -newkey rsa:4096 -nodes \
-subj "/C=US/ST=Test/L=Testing/O=Default/CN=${ipa_fqdn}" \
- -keyout ${certs_dir}/private.key \
- -out ${certs_dir}/request.csr
+ -keyout "${certs_dir}/private.key" \
+ -out "${certs_dir}/request.csr"
# Sign CSR to generate PEM certificate
if [ -z "${extensions_file}" ]; then
openssl x509 -req -days 365 -sha256 \
-CAcreateserial \
- -CA ${root_ca_cert} \
- -CAkey ${root_ca_private_key} \
- -in ${certs_dir}/request.csr \
- -out ${certs_dir}/cert.pem
+ -CA "${root_ca_cert}" \
+ -CAkey "${root_ca_private_key}" \
+ -in "${certs_dir}/request.csr" \
+ -out "${certs_dir}/cert.pem"
else
openssl x509 -req -days 365 -sha256 \
-CAcreateserial \
- -CA ${ROOT_CA_DIR}/cert.pem \
- -CAkey ${ROOT_CA_DIR}/private.key \
- -extfile ${extensions_file} \
- -extensions ${extensions_name} \
- -in ${certs_dir}/request.csr \
- -out ${certs_dir}/cert.pem
+ -CA "${ROOT_CA_DIR}/cert.pem" \
+ -CAkey "${ROOT_CA_DIR}/private.key" \
+ -extfile "${extensions_file}" \
+ -extensions "${extensions_name}" \
+ -in "${certs_dir}/request.csr" \
+ -out "${certs_dir}/cert.pem"
fi
# Convert certificate to PKCS12 format
openssl pkcs12 -export \
- -name ${cert_name} \
- -certfile ${root_ca_cert} \
- -in ${certs_dir}/cert.pem \
- -inkey ${certs_dir}/private.key \
+ -name "${cert_name}" \
+ -certfile "${root_ca_cert}" \
+ -in "${certs_dir}/cert.pem" \
+ -inkey "${certs_dir}/private.key" \
-passout "pass:${PKCS12_PASSWORD}" \
- -out ${certs_dir}/cert.p12
+ -out "${certs_dir}/cert.p12"
}
# generate_ipa_pkcs12_certificates $ipa_fqdn $ipa_domain
@@ -73,27 +73,27 @@ function generate_ipa_pkcs12_certificates {
fi
# Generate certificates folder structure
- mkdir -p ${ROOT_CA_DIR}
- mkdir -p ${DIRSRV_CERTS_DIR}/$host
- mkdir -p ${HTTPD_CERTS_DIR}/$host
- mkdir -p ${PKINIT_CERTS_DIR}/$host
+ mkdir -p "${ROOT_CA_DIR}"
+ mkdir -p "${DIRSRV_CERTS_DIR}/$host"
+ mkdir -p "${HTTPD_CERTS_DIR}/$host"
+ mkdir -p "${PKINIT_CERTS_DIR}/$host"
# Generate root CA
if [ ! -f "${ROOT_CA_DIR}/private.key" ]; then
openssl genrsa \
- -out ${ROOT_CA_DIR}/private.key 4096
+ -out "${ROOT_CA_DIR}/private.key" 4096
openssl req -new -x509 -sha256 -nodes -days 3650 \
-subj "/C=US/ST=Test/L=Testing/O=Default" \
- -key ${ROOT_CA_DIR}/private.key \
- -out ${ROOT_CA_DIR}/cert.pem
+ -key "${ROOT_CA_DIR}/private.key" \
+ -out "${ROOT_CA_DIR}/cert.pem"
fi
# Generate a certificate for the Directory Server
if [ ! -f "${DIRSRV_CERTS_DIR}/$host/cert.pem" ]; then
generate_ipa_pkcs12_certificate \
"dirsrv-cert" \
- $host \
+ "$host" \
"${DIRSRV_CERTS_DIR}/$host" \
"${ROOT_CA_DIR}/cert.pem" \
"${ROOT_CA_DIR}/private.key"
@@ -103,7 +103,7 @@ function generate_ipa_pkcs12_certificates {
if [ ! -f "${HTTPD_CERTS_DIR}/$host/cert.pem" ]; then
generate_ipa_pkcs12_certificate \
"httpd-cert" \
- $host \
+ "$host" \
"${HTTPD_CERTS_DIR}/$host" \
"${ROOT_CA_DIR}/cert.pem" \
"${ROOT_CA_DIR}/private.key"
@@ -115,7 +115,7 @@ function generate_ipa_pkcs12_certificates {
generate_ipa_pkcs12_certificate \
"pkinit-cert" \
- $host \
+ "$host" \
"${PKINIT_CERTS_DIR}/$host" \
"${ROOT_CA_DIR}/cert.pem" \
"${ROOT_CA_DIR}/private.key" \
@@ -135,17 +135,17 @@ function delete_ipa_pkcs12_certificates {
exit 0;
fi
- rm -f certificates/*/$host/*
- rm -f ${ROOT_CA_DIR}/*
+ rm -f certificates/*/"$host"/*
+ rm -f "${ROOT_CA_DIR}"/*
}
# Entrypoint
case "$1" in
create)
- generate_ipa_pkcs12_certificates $2 $3
+ generate_ipa_pkcs12_certificates "$2" "$3"
;;
delete)
- delete_ipa_pkcs12_certificates $2
+ delete_ipa_pkcs12_certificates "$2"
;;
*)
echo $"Usage: $0 {create|delete}"
diff --git a/tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yaml b/tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yaml
index d16cff7594913b834843f641b88e31a4beff49df..433d42948022663fdf2bf352264e732eb9ca7656 100644
--- a/tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yaml
+++ b/tests/pytests/dnszone/playbooks/dnszone_invalid_ip.yaml
@@ -1,5 +1,5 @@
---
-- name: Playbook to with invalid IP’s in allow_transfer.
+- name: Playbook to with invalid IPs in allow_transfer.
hosts: ipaserver
become: true
diff --git a/tests/pytests/dnszone/test_dnszone.py b/tests/pytests/dnszone/test_dnszone.py
index 353181234c2966b7a6a0e65d084b4e48133eafd5..00978f0fd917f4ef6c256b77489ea497dfa34c1d 100644
--- a/tests/pytests/dnszone/test_dnszone.py
+++ b/tests/pytests/dnszone/test_dnszone.py
@@ -112,7 +112,7 @@ class TestDNSZone(AnsibleFreeIPATestCase):
self.check_notexists([error], "dnszone-show", [add_zone])
def test_dnszone_invalid_ip(self):
- """TC-07: Update with invalid IP’s in allow_transfer. Bug#1845051."""
+ """TC-07: Update with invalid IPs in allow_transfer. Bug#1845051."""
invalid_zone_name = "invalidzone.test"
invalid_zone_ip = "in.va.li.d"
expected_error = "Invalid IP for DNS forwarder"
diff --git a/tests/user/users.sh b/tests/user/users.sh
index 52981c1e431959fb1fe16aeb2d3fc944a8ff1ba5..da408d751967314767e91832b1a1c53585e06a2f 100644
--- a/tests/user/users.sh
+++ b/tests/user/users.sh
@@ -4,24 +4,26 @@ NUM=${1-1000}
FILE="users.json"
date=$(date --date='+2 years' "+%Y-%m-%d %H:%M:%S")
-echo "{" > $FILE
+echo "{" > "$FILE"
-echo " \"users\": [" >> $FILE
+echo " \"users\": [" >> "$FILE"
-for i in $(seq 1 $NUM); do
- echo " {" >> $FILE
- echo " \"name\": \"user$i\"," >> $FILE
- echo " \"first\": \"First $i\"," >> $FILE
- echo " \"last\": \"Last $i\"," >> $FILE
- echo " \"password\": \"user${i}PW\"," >> $FILE
- echo " \"passwordexpiration\": \"$date\"" >> $FILE
- if [ $i -lt $NUM ]; then
- echo " }," >> $FILE
+for i in $(seq 1 "$NUM"); do
+ {
+ echo " {"
+ echo " \"name\": \"user$i\","
+ echo " \"first\": \"First $i\","
+ echo " \"last\": \"Last $i\","
+ echo " \"password\": \"user${i}PW\","
+ echo " \"passwordexpiration\": \"$date\""
+ } >> "$FILE"
+ if [ "$i" -lt "$NUM" ]; then
+ echo " }," >> "$FILE"
else
- echo " }" >> $FILE
+ echo " }" >> "$FILE"
fi
done
-echo " ]" >> $FILE
+echo " ]" >> "$FILE"
-echo "}" >> $FILE
+echo "}" >> "$FILE"
diff --git a/tests/user/users_absent.sh b/tests/user/users_absent.sh
index 1ee89ada0b11efb7de8cc0b50d27cfc64d92f9b8..f0179931360e52b60292c89340c8a5601aed8937 100644
--- a/tests/user/users_absent.sh
+++ b/tests/user/users_absent.sh
@@ -3,20 +3,20 @@
NUM=1000
FILE="users_absent.json"
-echo "{" > $FILE
+echo "{" > "$FILE"
-echo " \"users\": [" >> $FILE
+echo " \"users\": [" >> "$FILE"
-for i in $(seq 1 $NUM); do
- echo " {" >> $FILE
- echo " \"name\": \"user$i\"," >> $FILE
- if [ $i -lt $NUM ]; then
- echo " }," >> $FILE
+for i in $(seq 1 "$NUM"); do
+ echo " {" >> "$FILE"
+ echo " \"name\": \"user$i\"," >> "$FILE"
+ if [ "$i" -lt "$NUM" ]; then
+ echo " }," >> "$FILE"
else
- echo " }" >> $FILE
+ echo " }" >> "$FILE"
fi
done
-echo " ]" >> $FILE
+echo " ]" >> "$FILE"
-echo "}" >> $FILE
+echo "}" >> "$FILE"
diff --git a/utils/gen_module_docs.py b/utils/gen_module_docs.py
index 4994a3466b058b2eb09fac0ed1a9a07ca94aa74b..b3ac9f57e38b6f8af60e81d48f20d9010f361a9f 100644
--- a/utils/gen_module_docs.py
+++ b/utils/gen_module_docs.py
@@ -206,7 +206,7 @@ def gen_module_docs(module_in):
# print("%s: Bad argument dict line '%s'" % (module_in,
# stripped))
while ")," not in stripped and i < len(in_lines) - 1:
- next_stripped = in_lines[i+1].strip()
+ next_stripped = in_lines[i + 1].strip()
if not next_stripped.startswith("# "):
stripped += next_stripped
i += 1
diff --git a/utils/templates/ipamodule+member.py.in b/utils/templates/ipamodule+member.py.in
index d3438b1b4cc224e16420cdeb35cf437044fe72de..1515ccc194ae5e10d66adcc9e408b571f3e8dd60 100644
--- a/utils/templates/ipamodule+member.py.in
+++ b/utils/templates/ipamodule+member.py.in
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
@@ -100,8 +103,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, gen_add_list, \
gen_intersection_list
-
-import six
+from ansible.module_utils import six
if six.PY3:
unicode = str
diff --git a/utils/templates/ipamodule.py.in b/utils/templates/ipamodule.py.in
index e305c9765d6f404c4956811986759d91f48f2703..00750f83b199e2f8bab163daf57c7ee9f80b5d75 100644
--- a/utils/templates/ipamodule.py.in
+++ b/utils/templates/ipamodule.py.in
@@ -1,4 +1,3 @@
-#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -20,6 +19,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
ANSIBLE_METADATA = {
"metadata_version": "1.0",
"supported_by": "community",
@@ -79,7 +82,7 @@ RETURN = """
from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa
-import six
+from ansible.module_utils import six
if six.PY3:
unicode = str