On 05/21/2015 12:55 PM, thierry bordaz wrote:
On 05/20/2015 05:40 PM, Ludwig Krispenz wrote:
please find new versions of patches 0003 and 0005 for  the topology

the ds plugin patch includes
- changes to match domain level patch
- remove trailing white spaces
- use proper oids for topology schema

the install patch
- has the  70topology.ldif removed

Hello Ludwig,

I failed to do 'git am patch-0003', it returned a strange "Patch format
detection failed.".
However I was able to do 'git apply' and to review it.

I focus on the points discussed during previous reviews.
The patch is looking good to me. ACK

Patch 0005 looks good to me if we squash there attached patch(typo fixes).

I think that both 0003 and 0005 could be pushed. But I'll do it when testing with Domain Level patch is successful.

patch 0006 will be replaced with the one I'm working on.


Petr Vobornik
From d83ae4ccf4d74f89e4a12fbeefc3d46abfdf3b61 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvobo...@redhat.com>
Date: Fri, 22 May 2015 13:40:25 +0200
Subject: [PATCH] topology installation - minor fixes

 install/share/topology-entries.ldif | 2 +-
 ipaserver/install/dsinstance.py     | 2 +-
 ipaserver/install/replication.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install/share/topology-entries.ldif b/install/share/topology-entries.ldif
index 309246f0b0d038741d8c44be6d96614c77095e83..5ee4f617a0e578382e895d9f9ca0d4079af80741 100644
--- a/install/share/topology-entries.ldif
+++ b/install/share/topology-entries.ldif
@@ -4,7 +4,7 @@ objectclass: top
 objectclass: nsContainer
 cn: topology
-# default topology configuration aere
+# default topology configuration area
 dn: cn=realm,cn=topology,cn=ipa,cn=etc,$SUFFIX
 changetype: add
 objectclass: top
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index c8b08057d52f81ef91c5c88bdc8ea4bbd856110a..a2086c23c36e17d8e24e73e2874701de3dd84239 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -303,7 +303,7 @@ class DsInstance(service.Service):
         self.step("adding range check plugin", self.__add_range_check_plugin)
         if hbac_allow:
             self.step("creating default HBAC rule allow_all", self.add_hbac)
-        self.step("adding entries for toplogy management", self.__add_topology_entries)
+        self.step("adding entries for topology management", self.__add_topology_entries)
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 8604d63f8fe06d56f4627bdb2ef3107f5223e550..643639ef4b22f808cc61643309185ec17b321718 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -416,7 +416,7 @@ class ReplicationManager(object):
         assert isinstance(replica_binddn, DN)
         dn = self.replica_dn()
         assert isinstance(dn, DN)
-        replica_groupdn = DN(('cn', 'replication managers'), ('cn=etc'), self.suffix)
+        replica_groupdn = DN(('cn', 'replication managers'), ('cn', 'etc'), self.suffix)
             entry = conn.get_entry(dn)

Manage your subscription for the Freeipa-devel mailing list:
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to