diff mbox

[ovs-dev,v2] ovn-controller(8): ovn-remote must be an ovsdb remote.

Message ID 20161205222620.29114-1-russell@ovn.org
State Accepted
Headers show

Commit Message

Russell Bryant Dec. 5, 2016, 10:26 p.m. UTC
Document that the value of the ovn-remote configuration
option must be in the form of an ovsdb remote as previously documented
in this man page. This came up on IRC where someone trying OVN
put a hostname here and observed that it did not work.

Signed-off-by: Russell Bryant <russell@ovn.org>
---
 ovn/controller/ovn-controller.8.xml | 9 ++-------
 ovn/controller/ovn-controller.c     | 5 +----
 2 files changed, 3 insertions(+), 11 deletions(-)

v1->v2:
 - Drop old docs and a code comment that said you couldn't change ovn-remote at runtime
 - Update patch to specify that the value is an ovsdb remote (not an IP address as
   specified in v1)

Comments

Ben Pfaff Dec. 5, 2016, 10:40 p.m. UTC | #1
On Mon, Dec 05, 2016 at 05:26:20PM -0500, Russell Bryant wrote:
> Document that the value of the ovn-remote configuration
> option must be in the form of an ovsdb remote as previously documented
> in this man page. This came up on IRC where someone trying OVN
> put a hostname here and observed that it did not work.
> 
> Signed-off-by: Russell Bryant <russell@ovn.org>

Thanks!

Acked-by: Ben Pfaff <blp@ovn.org>
Russell Bryant Dec. 6, 2016, 1:31 a.m. UTC | #2
On Mon, Dec 5, 2016 at 5:40 PM, Ben Pfaff <blp@ovn.org> wrote:

> On Mon, Dec 05, 2016 at 05:26:20PM -0500, Russell Bryant wrote:
> > Document that the value of the ovn-remote configuration
> > option must be in the form of an ovsdb remote as previously documented
> > in this man page. This came up on IRC where someone trying OVN
> > put a hostname here and observed that it did not work.
> >
> > Signed-off-by: Russell Bryant <russell@ovn.org>
>
> Thanks!
>
> Acked-by: Ben Pfaff <blp@ovn.org>
>

Thanks, I applied this to master.
diff mbox

Patch

diff --git a/ovn/controller/ovn-controller.8.xml b/ovn/controller/ovn-controller.8.xml
index 5f51cb1..9f4dad1 100644
--- a/ovn/controller/ovn-controller.8.xml
+++ b/ovn/controller/ovn-controller.8.xml
@@ -93,13 +93,8 @@ 
       <dd>
         <p>
           The OVN database that this system should connect to for its
-          configuration.
-        </p>
-
-        <p>
-          Currently, <code>ovn-controller</code> does not support changing this
-          setting mid-run.  If the value needs to change, the daemon must be
-          restarted.  (This behavior should be improved.)
+          configuration, in one of the same forms documented above for the
+          <var>ovs-database</var>.
         </p>
       </dd>
 
diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index fea7841..4fbf455 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -204,10 +204,7 @@  get_chassis_id(const struct ovsdb_idl *ovs_idl)
 }
 
 /* Retrieves the OVN Southbound remote location from the
- * "external-ids:ovn-remote" key in 'ovs_idl' and returns a copy of it.
- *
- * XXX ovn-controller does not support this changing mid-run, but that should
- * be addressed later. */
+ * "external-ids:ovn-remote" key in 'ovs_idl' and returns a copy of it. */
 static char *
 get_ovnsb_remote(struct ovsdb_idl *ovs_idl)
 {