diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2015-12-10 16:32:35 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-12-14 15:41:28 +0100 |
| commit | c4b9b295d8184694c50c0d56051e0273445c98ec (patch) | |
| tree | 3faf10899ec39b6dab71fc20fcf1875c8adf16b9 | |
| parent | 110e3dfc5401899ae0a54cc979ca0820e53cfa02 (diff) | |
| download | freeipa-c4b9b295d8184694c50c0d56051e0273445c98ec.tar.gz freeipa-c4b9b295d8184694c50c0d56051e0273445c98ec.tar.xz freeipa-c4b9b295d8184694c50c0d56051e0273445c98ec.zip | |
CI tests: remove '-p' option from ipa-dns-install calls
fix for https://fedorahosted.org/freeipa/ticket/4933 made ipa-dns-install to
use LDAPI and deprecated -p option for directory manager password. This patche
remove the option from calls to ipa-dns-install in CI tests so that
deprecation warning does not clutter the logs.
Reviewed-By: Milan Kubik <mkubik@redhat.com>
| -rw-r--r-- | ipatests/test_integration/tasks.py | 3 | ||||
| -rw-r--r-- | ipatests/test_integration/test_backup_and_restore.py | 1 | ||||
| -rw-r--r-- | ipatests/test_integration/test_dnssec.py | 5 |
3 files changed, 1 insertions, 8 deletions
diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py index c3681fca9..eb1378ef4 100644 --- a/ipatests/test_integration/tasks.py +++ b/ipatests/test_integration/tasks.py @@ -935,7 +935,7 @@ def resolve_record(nameserver, query, rtype="SOA", retry=True, timeout=100): def install_kra(host, domain_level=None, first_instance=False, raiseonerr=True): if not domain_level: domain_level = domainlevel(host) - command = ["ipa-kra-install", "-U", "-p", host.config.dirman_password] + command = ["ipa-kra-install", "-U"] if domain_level == DOMAIN_LEVEL_0 and not first_instance: replica_file = get_replica_filename(host) command.append(replica_file) @@ -957,7 +957,6 @@ def install_dns(host, raiseonerr=True): args = [ "ipa-dns-install", "--forwarder", host.config.dns_forwarder, - "-p", host.config.dirman_password, "-U", ] return host.run_command(args, raiseonerr=raiseonerr) diff --git a/ipatests/test_integration/test_backup_and_restore.py b/ipatests/test_integration/test_backup_and_restore.py index 8b9cd2dc4..b8abb343b 100644 --- a/ipatests/test_integration/test_backup_and_restore.py +++ b/ipatests/test_integration/test_backup_and_restore.py @@ -285,7 +285,6 @@ class BaseBackupAndRestoreWithDNSSEC(IntegrationTest): "ipa-dns-install", "--dnssec-master", "--forwarder", cls.master.config.dns_forwarder, - "-p", cls.master.config.dirman_password, "-U", ] cls.master.run_command(args) diff --git a/ipatests/test_integration/test_dnssec.py b/ipatests/test_integration/test_dnssec.py index 5d6acb7cc..a4387d353 100644 --- a/ipatests/test_integration/test_dnssec.py +++ b/ipatests/test_integration/test_dnssec.py @@ -91,7 +91,6 @@ class TestInstallDNSSECLast(IntegrationTest): "ipa-dns-install", "--dnssec-master", "--forwarder", self.master.config.dns_forwarder, - "-p", self.master.config.dirman_password, "-U", ] self.master.run_command(args) @@ -249,7 +248,6 @@ class TestInstallDNSSECFirst(IntegrationTest): "ipa-dns-install", "--dnssec-master", "--forwarder", cls.master.config.dns_forwarder, - "-p", cls.master.config.dirman_password, "-U", ] cls.master.run_command(args) @@ -423,7 +421,6 @@ class TestMigrateDNSSECMaster(IntegrationTest): "ipa-dns-install", "--dnssec-master", "--forwarder", cls.master.config.dns_forwarder, - "-p", cls.master.config.dirman_password, "-U", ] cls.master.run_command(args) @@ -458,7 +455,6 @@ class TestMigrateDNSSECMaster(IntegrationTest): "ipa-dns-install", "--disable-dnssec-master", "--forwarder", self.master.config.dns_forwarder, - "-p", self.master.config.dirman_password, "--force", "-U", ] @@ -474,7 +470,6 @@ class TestMigrateDNSSECMaster(IntegrationTest): "--dnssec-master", "--kasp-db", replica_backup_filename, "--forwarder", self.master.config.dns_forwarder, - "-p", self.master.config.dirman_password, "-U", ] self.replicas[0].run_command(args) |