3.0 new iproto format: manual leader

Author: andreyaksenov

doc/code_snippets/snippets/replication/instances.enabled/manual_leader/config.yaml

@@ -6,7 +6,8 @@ credentials:
 
 iproto:
   advertise:
-    peer: replicator@
+    peer:
+      login: replicator
 
 replication:
   failover: manual
@@ -19,13 +20,16 @@ groups:
         instances:
           instance001:
             iproto:
-              listen: 127.0.0.1:3301
+              listen:
+                - uri: '127.0.0.1:3301'
           instance002:
             iproto:
-              listen: 127.0.0.1:3302
+              listen:
+                - uri: '127.0.0.1:3302'
           instance003:
             iproto:
-              listen: 127.0.0.1:3303
+              listen:
+                - uri: '127.0.0.1:3303'
 
 # Load sample data
 app:

doc/concepts/configuration.rst

@@ -156,9 +156,9 @@ You can learn more about configuring replication from :ref:`Replication tutorial
 -   ``iproto`` (*global*, *instance*)
 
     The ``iproto`` section is specified on both global and instance levels.
-    The ``iproto.advertise.peer`` option specifies a URI used by an instance to connect to another instance as a replica.
-    In the example above, the URI includes a user name only.
-    A host value is taken from ``iproto.listen`` that is set on the instance level.
+    The ``iproto.advertise.peer`` option specifies the parameters used by an instance to connect to another instance as a replica, for example, a URI, a login and password, or SSL parameters .
+    In the example above, the option includes ``login`` only.
+    An URI is taken from ``iproto.listen`` that is set on the instance level.
 
 -   ``replication``: (*global*)
 

doc/how-to/replication/repl_bootstrap.rst

@@ -68,7 +68,7 @@ Define a replica set topology inside the :ref:`groups <configuration_reference_g
 ..  literalinclude:: /code_snippets/snippets/replication/instances.enabled/manual_leader/config.yaml
     :language: yaml
     :start-at: groups:
-    :end-at: listen: 127.0.0.1:3302
+    :end-at: 127.0.0.1:3302
     :dedent:
 
 
@@ -96,7 +96,7 @@ Set :ref:`iproto.advertise.peer <configuration_reference_iproto_advertise_peer>`
 ..  literalinclude:: /code_snippets/snippets/replication/instances.enabled/manual_leader/config.yaml
     :language: yaml
     :start-at: iproto:
-    :end-at: peer: replicator@
+    :end-at: login: replicator
     :dedent:
 
 .. _replication-master_replica_configuring_result:
@@ -108,7 +108,7 @@ The resulting replica set configuration should look as follows:
 
 ..  literalinclude:: /code_snippets/snippets/replication/instances.enabled/manual_leader/config.yaml
     :language: yaml
-    :end-at: listen: 127.0.0.1:3302
+    :end-at: 127.0.0.1:3302
     :dedent:
 
 
@@ -267,7 +267,7 @@ Adding an instance to the configuration
     ..  literalinclude:: /code_snippets/snippets/replication/instances.enabled/manual_leader/config.yaml
         :language: yaml
         :start-at: groups:
-        :end-at: listen: 127.0.0.1:3303
+        :end-at: 127.0.0.1:3303
         :dedent:
 
 
@@ -584,7 +584,7 @@ Removing an instance from the configuration
     ..  literalinclude:: /code_snippets/snippets/replication/instances.enabled/manual_leader/config.yaml
         :language: yaml
         :start-at: instances
-        :end-at: listen: 127.0.0.1:3302
+        :end-at: 127.0.0.1:3302
         :dedent:
 
 3.  Reload configurations on ``instance001`` and ``instance002``:

doc/reference/configuration/configuration_reference.rst

@@ -810,7 +810,7 @@ replicasets
     ..  literalinclude:: /code_snippets/snippets/replication/instances.enabled/manual_leader/config.yaml
         :language: yaml
         :start-at: replication:
-        :end-at: listen: 127.0.0.1:3303
+        :end-at: 127.0.0.1:3303
         :dedent: