diff options
| author | Simo Sorce <ssorce@redhat.com> | 2012-01-04 13:50:19 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2012-01-13 10:23:53 -0500 |
| commit | 869940ec4ae6bf43998dea911940c6504fafbbac (patch) | |
| tree | ff32e7b9ae94c40cfde058442e735e83a384821f /ipaserver | |
| parent | 4ef3d7ba9b101553d79110b8823abef1f5ef178b (diff) | |
| download | freeipa-ipa-2-1.tar.gz freeipa-ipa-2-1.tar.xz freeipa-ipa-2-1.zip | |
Fix replication setupipa-2-1
Changes to add a cs-replication management tool mistakenly always set a flag
that caused replicas to not add the list of attribute we exclude from
replication.
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/replication.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py index a6bd7af37..8c8502e3f 100644 --- a/ipaserver/install/replication.py +++ b/ipaserver/install/replication.py @@ -654,7 +654,9 @@ class ReplicationManager(object): self.replica_config(conn, replica_id, repldn) self.setup_changelog(conn) - def setup_replication(self, r_hostname, r_port=389, r_sslport=636, r_binddn=None, r_bindpw=None, starttls=False): + def setup_replication(self, r_hostname, r_port=389, r_sslport=636, + r_binddn=None, r_bindpw=None, starttls=False, + is_cs_replica=False): # note - there appears to be a bug in python-ldap - it does not # allow connections using two different CA certs if starttls: @@ -679,14 +681,22 @@ class ReplicationManager(object): self.basic_replication_setup(r_conn, r_id, self.repl_man_dn, self.repl_man_passwd) - self.setup_agreement(r_conn, self.conn.host, port=r_port, - repl_man_dn=self.repl_man_dn, - repl_man_passwd=self.repl_man_passwd, - master=True) - self.setup_agreement(self.conn, r_hostname, port=r_port, - repl_man_dn=self.repl_man_dn, - repl_man_passwd=self.repl_man_passwd, - master=False) + if is_cs_replica: + self.setup_agreement(r_conn, self.conn.host, port=r_port, + repl_man_dn=self.repl_man_dn, + repl_man_passwd=self.repl_man_passwd, + master=True) + self.setup_agreement(self.conn, r_hostname, port=r_port, + repl_man_dn=self.repl_man_dn, + repl_man_passwd=self.repl_man_passwd, + master=False) + else: + self.setup_agreement(r_conn, self.conn.host, port=r_port, + repl_man_dn=self.repl_man_dn, + repl_man_passwd=self.repl_man_passwd) + self.setup_agreement(self.conn, r_hostname, port=r_port, + repl_man_dn=self.repl_man_dn, + repl_man_passwd=self.repl_man_passwd) #Finally start replication ret = self.start_replication(r_conn, master=True) |