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>
This commit is contained in:
Martin Babinsky 2015-12-10 16:32:35 +01:00 committed by Martin Basti
parent 110e3dfc54
commit c4b9b295d8
3 changed files with 1 additions and 8 deletions

View File

@ -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): def install_kra(host, domain_level=None, first_instance=False, raiseonerr=True):
if not domain_level: if not domain_level:
domain_level = domainlevel(host) 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: if domain_level == DOMAIN_LEVEL_0 and not first_instance:
replica_file = get_replica_filename(host) replica_file = get_replica_filename(host)
command.append(replica_file) command.append(replica_file)
@ -957,7 +957,6 @@ def install_dns(host, raiseonerr=True):
args = [ args = [
"ipa-dns-install", "ipa-dns-install",
"--forwarder", host.config.dns_forwarder, "--forwarder", host.config.dns_forwarder,
"-p", host.config.dirman_password,
"-U", "-U",
] ]
return host.run_command(args, raiseonerr=raiseonerr) return host.run_command(args, raiseonerr=raiseonerr)

View File

@ -285,7 +285,6 @@ class BaseBackupAndRestoreWithDNSSEC(IntegrationTest):
"ipa-dns-install", "ipa-dns-install",
"--dnssec-master", "--dnssec-master",
"--forwarder", cls.master.config.dns_forwarder, "--forwarder", cls.master.config.dns_forwarder,
"-p", cls.master.config.dirman_password,
"-U", "-U",
] ]
cls.master.run_command(args) cls.master.run_command(args)

View File

@ -91,7 +91,6 @@ class TestInstallDNSSECLast(IntegrationTest):
"ipa-dns-install", "ipa-dns-install",
"--dnssec-master", "--dnssec-master",
"--forwarder", self.master.config.dns_forwarder, "--forwarder", self.master.config.dns_forwarder,
"-p", self.master.config.dirman_password,
"-U", "-U",
] ]
self.master.run_command(args) self.master.run_command(args)
@ -249,7 +248,6 @@ class TestInstallDNSSECFirst(IntegrationTest):
"ipa-dns-install", "ipa-dns-install",
"--dnssec-master", "--dnssec-master",
"--forwarder", cls.master.config.dns_forwarder, "--forwarder", cls.master.config.dns_forwarder,
"-p", cls.master.config.dirman_password,
"-U", "-U",
] ]
cls.master.run_command(args) cls.master.run_command(args)
@ -423,7 +421,6 @@ class TestMigrateDNSSECMaster(IntegrationTest):
"ipa-dns-install", "ipa-dns-install",
"--dnssec-master", "--dnssec-master",
"--forwarder", cls.master.config.dns_forwarder, "--forwarder", cls.master.config.dns_forwarder,
"-p", cls.master.config.dirman_password,
"-U", "-U",
] ]
cls.master.run_command(args) cls.master.run_command(args)
@ -458,7 +455,6 @@ class TestMigrateDNSSECMaster(IntegrationTest):
"ipa-dns-install", "ipa-dns-install",
"--disable-dnssec-master", "--disable-dnssec-master",
"--forwarder", self.master.config.dns_forwarder, "--forwarder", self.master.config.dns_forwarder,
"-p", self.master.config.dirman_password,
"--force", "--force",
"-U", "-U",
] ]
@ -474,7 +470,6 @@ class TestMigrateDNSSECMaster(IntegrationTest):
"--dnssec-master", "--dnssec-master",
"--kasp-db", replica_backup_filename, "--kasp-db", replica_backup_filename,
"--forwarder", self.master.config.dns_forwarder, "--forwarder", self.master.config.dns_forwarder,
"-p", self.master.config.dirman_password,
"-U", "-U",
] ]
self.replicas[0].run_command(args) self.replicas[0].run_command(args)