Change the service name to reflect changes in pki-ca (now pki-cad).

Also properly use the instance name where appropriate. There were a
couple of places where the service name was used and this worked because
they were the same.

1 files changed, 3 insertions, 3 deletions

diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 46a337cb0..e74469f76 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -381,7 +381,7 @@ class CAInstance(service.Service):
     """
 
     def __init__(self):
-        service.Service.__init__(self, "pki-ca")
+        service.Service.__init__(self, "pki-cad")
         self.pki_user = "pkiuser"
         self.dm_password = None
         self.admin_password = None
@@ -524,7 +524,7 @@ class CAInstance(service.Service):
         except ipautil.CalledProcessError, e:
             print "failed to restart ca instance", e
 
-        preop_pin = get_preop_pin(self.server_root, self.service_name)
+        preop_pin = get_preop_pin(self.server_root, PKI_INSTANCE_NAME)
 
         try:
             args = ["/usr/bin/perl", "/usr/bin/pkisilent",  "ConfigureCA",
@@ -1003,7 +1003,7 @@ class CAInstance(service.Service):
     def uninstall(self):
         try:
             ipautil.run(["/usr/bin/pkiremove", "-pki_instance_root=/var/lib",
-                         "-pki_instance_name=pki-ca", "--force"])
+                         "-pki_instance_name=%s" % PKI_INSTANCE_NAME, "--force"])
         except ipautil.CalledProcessError, e:
             logging.critical("failed to uninstall CA instance %s" % e)