590d18
From 8fd313b624e3da699280f81da1f88ef7149e6123 Mon Sep 17 00:00:00 2001
590d18
From: Jan Cholasta <jcholast@redhat.com>
590d18
Date: Wed, 12 Aug 2015 07:49:53 +0200
590d18
Subject: [PATCH] install: Fix server and replica install options
590d18
590d18
https://fedorahosted.org/freeipa/ticket/5184
590d18
590d18
Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
590d18
---
590d18
 ipaserver/install/server/install.py        | 55 ++++++------------------------
590d18
 ipaserver/install/server/replicainstall.py | 36 ++++---------------
590d18
 2 files changed, 17 insertions(+), 74 deletions(-)
590d18
590d18
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
590d18
index b9bf3f34bdb7c32115e5c6a7038f11f901ab06b8..ff517513473a458a84f63c5c1308a8cc0b8699f8 100644
590d18
--- a/ipaserver/install/server/install.py
590d18
+++ b/ipaserver/install/server/install.py
590d18
@@ -1137,18 +1137,6 @@ def uninstall(installer):
590d18
 class ServerCA(common.Installable, core.Group, core.Composite):
590d18
     description = "certificate system"
590d18
 
590d18
-    setup_ca = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="configure a dogtag CA",
590d18
-    )
590d18
-
590d18
-    setup_kra = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="configure a dogtag KRA",
590d18
-    )
590d18
-
590d18
     external_ca = Knob(
590d18
         bool, False,
590d18
         description=("Generate a CSR for the IPA CA certificate to be signed "
590d18
@@ -1163,7 +1151,7 @@ class ServerCA(common.Installable, core.Group, core.Composite):
590d18
     external_cert_files = Knob(
590d18
         (list, str), None,
590d18
         description=("File containing the IPA CA certificate and the external "
590d18
-                     "CA certificate chain (can be specified multiple times)"),
590d18
+                     "CA certificate chain"),
590d18
         cli_name='external-cert-file',
590d18
         cli_aliases=['external_cert_file', 'external_ca_file'],
590d18
         cli_metavar='FILE',
590d18
@@ -1308,6 +1296,7 @@ class ServerDNS(common.Installable, core.Group, core.Composite):
590d18
         description=("The reverse DNS zone to use. This option can be used "
590d18
                      "multiple times"),
590d18
         cli_name='reverse-zone',
590d18
+        cli_metavar='REVERSE_ZONE',
590d18
     )
590d18
 
590d18
     no_reverse = Knob(
590d18
@@ -1320,31 +1309,6 @@ class ServerDNS(common.Installable, core.Group, core.Composite):
590d18
         description="Disable DNSSEC validation",
590d18
     )
590d18
 
590d18
-    dnssec_master = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="Setup server to be DNSSEC key master",
590d18
-    )
590d18
-
590d18
-    disable_dnssec_master = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="Disable the DNSSEC master on this server",
590d18
-    )
590d18
-
590d18
-    kasp_db_file = Knob(
590d18
-        str, None,
590d18
-        initializable=False,
590d18
-        description="Copy OpenDNSSEC metadata from the specified file (will "
590d18
-                    "not create a new kasp.db file)",
590d18
-    )
590d18
-
590d18
-    force = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="Force install",
590d18
-    )
590d18
-
590d18
     zonemgr = Knob(
590d18
         str, None,
590d18
         description=("DNS zone manager e-mail address. Defaults to "
590d18
@@ -1416,7 +1380,6 @@ class Server(common.Installable, common.Interactive, core.Composite):
590d18
     master_password = Knob(
590d18
         str, None,
590d18
         sensitive=True,
590d18
-        deprecated=True,
590d18
         description="kerberos master password (normally autogenerated)",
590d18
         cli_short_name='P',
590d18
     )
590d18
@@ -1466,11 +1429,13 @@ class Server(common.Installable, common.Interactive, core.Composite):
590d18
         description=("Master Server IP Address. This option can be used "
590d18
                      "multiple times"),
590d18
         cli_name='ip-address',
590d18
+        cli_metavar='IP_ADDRESS',
590d18
     )
590d18
 
590d18
     no_ntp = Knob(
590d18
         bool, False,
590d18
         description="do not configure ntp",
590d18
+        cli_short_name='N',
590d18
     )
590d18
 
590d18
     idstart = Knob(
590d18
@@ -1615,8 +1580,8 @@ class Server(common.Installable, common.Interactive, core.Composite):
590d18
         # Automatically disable pkinit w/ dogtag until that is supported
590d18
         self.ca.no_pkinit = True
590d18
 
590d18
-        self.setup_ca = self.ca.setup_ca
590d18
-        self.setup_kra = self.ca.setup_kra
590d18
+        self.setup_ca = False
590d18
+        self.setup_kra = False
590d18
         self.external_ca = self.ca.external_ca
590d18
         self.external_ca_type = self.ca.external_ca_type
590d18
         self.external_cert_files = self.ca.external_cert_files
590d18
@@ -1639,10 +1604,10 @@ class Server(common.Installable, common.Interactive, core.Composite):
590d18
         self.reverse_zones = self.dns.reverse_zones
590d18
         self.no_reverse = self.dns.no_reverse
590d18
         self.no_dnssec_validation = self.dns.no_dnssec_validation
590d18
-        self.dnssec_master = self.dns.dnssec_master
590d18
-        self.disable_dnssec_master = self.dns.disable_dnssec_master
590d18
-        self.kasp_db_file = self.dns.kasp_db_file
590d18
-        self.force = self.dns.force
590d18
+        self.dnssec_master = False
590d18
+        self.disable_dnssec_master = False
590d18
+        self.kasp_db_file = None
590d18
+        self.force = False
590d18
         self.zonemgr = self.dns.zonemgr
590d18
         self.no_host_dns = self.dns.no_host_dns
590d18
         self.no_dns_sshfp = self.dns.no_dns_sshfp
590d18
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
590d18
index 1ad291a1eada080361031a5723a0ea61679fc72e..dd8bc0d4bb7d8d9835a3e3e4dc24d1f67199d28f 100644
590d18
--- a/ipaserver/install/server/replicainstall.py
590d18
+++ b/ipaserver/install/server/replicainstall.py
590d18
@@ -679,6 +679,7 @@ class ReplicaDNS(common.Installable, core.Group, core.Composite):
590d18
         description=("The reverse DNS zone to use. This option can be used "
590d18
                      "multiple times"),
590d18
         cli_name='reverse-zone',
590d18
+        cli_metavar='REVERSE_ZONE',
590d18
     )
590d18
 
590d18
     no_reverse = Knob(
590d18
@@ -691,31 +692,6 @@ class ReplicaDNS(common.Installable, core.Group, core.Composite):
590d18
         description="Disable DNSSEC validation",
590d18
     )
590d18
 
590d18
-    dnssec_master = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="Setup server to be DNSSEC key master",
590d18
-    )
590d18
-
590d18
-    disable_dnssec_master = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="Disable the DNSSEC master on this server",
590d18
-    )
590d18
-
590d18
-    force = Knob(
590d18
-        bool, False,
590d18
-        initializable=False,
590d18
-        description="Force install",
590d18
-    )
590d18
-
590d18
-    kasp_db_file = Knob(
590d18
-        str, None,
590d18
-        initializable=False,
590d18
-        description="Copy OpenDNSSEC metadata from the specified file (will "
590d18
-                    "not create a new kasp.db file)",
590d18
-    )
590d18
-
590d18
     no_host_dns = Knob(
590d18
         bool, False,
590d18
         description="Do not use DNS for hostname lookup during installation",
590d18
@@ -750,6 +726,7 @@ class Replica(common.Installable, common.Interactive, core.Composite):
590d18
         description=("Replica server IP Address. This option can be used "
590d18
                      "multiple times"),
590d18
         cli_name='ip-address',
590d18
+        cli_metavar='IP_ADDRESS',
590d18
     )
590d18
 
590d18
     password = Knob(
590d18
@@ -774,6 +751,7 @@ class Replica(common.Installable, common.Interactive, core.Composite):
590d18
     no_ntp = Knob(
590d18
         bool, False,
590d18
         description="do not configure ntp",
590d18
+        cli_short_name='N',
590d18
     )
590d18
 
590d18
     no_ui_redirect = Knob(
590d18
@@ -864,10 +842,10 @@ class Replica(common.Installable, common.Interactive, core.Composite):
590d18
         self.reverse_zones = self.dns.reverse_zones
590d18
         self.no_reverse = self.dns.no_reverse
590d18
         self.no_dnssec_validation = self.dns.no_dnssec_validation
590d18
-        self.dnssec_master = self.dns.dnssec_master
590d18
-        self.disable_dnssec_master = self.dns.disable_dnssec_master
590d18
-        self.kasp_db_file = self.dns.kasp_db_file
590d18
-        self.force = self.dns.force
590d18
+        self.dnssec_master = False
590d18
+        self.disable_dnssec_master = False
590d18
+        self.kasp_db_file = None
590d18
+        self.force = False
590d18
         self.zonemgr = None
590d18
         self.no_host_dns = self.dns.no_host_dns
590d18
         self.no_dns_sshfp = self.dns.no_dns_sshfp
590d18
-- 
590d18
2.4.3
590d18