From: Aliasgar Ginwala
Add new env variables OVN_NBCTL_OPTIONS and OVN_SBCTL_OPTIONS for
ovn-nbctl and ovn-sbctl respectively where user can set
supported ovn-nb/sbctl options using environment variable.
e.g. OVN_SBCTL_OPTIONS="--db=unix:sb1.ovsdb --no-leader-only"
Signed-off-by: Aliasgar Ginwala
---
v1 -> v2
---
* Addressed Ben's comment - Write ovs_cmdl_env_parse_all for parsing
env options in lib/command-line.c and update docs about new env var
usage.
utilities/ovn-nbctl.8.xml | 25 +
utilities/ovn-nbctl.c | 19 +--
utilities/ovn-sbctl.8.in | 8
utilities/ovn-sbctl.c | 19 +--
4 files changed, 67 insertions(+), 4 deletions(-)
diff --git a/utilities/ovn-nbctl.8.xml b/utilities/ovn-nbctl.8.xml
index fd75c0e44..b207dac46 100644
--- a/utilities/ovn-nbctl.8.xml
+++ b/utilities/ovn-nbctl.8.xml
@@ -1178,6 +1178,31 @@
wait at all. Use the sync command to override this
behavior.
+
+
+ User can set one or more OVN_NBCTL_OPTIONS options in
+ environment variable. Under the Bourne shell this might be
+ done like this:
+
+
+
+ OVN_NBCTL_OPTIONS="--db=unix:nb1.ovsdb --no-leader-only"
+
+
+
+ When OVN_NBCTL_OPTIONS is set, ovn-nbctl
+ automatically and transparently uses the environment variable to
+ execute its commands. However user can still over-ride environment
+ options by passing different in cli.
+
+
+
+ When the environment variable is no longer needed, unset it, e.g.:
+
+
+
+ unset OVN_NBCTL_OPTIONS
+
--db database
diff --git a/utilities/ovn-nbctl.c b/utilities/ovn-nbctl.c
index a89a9cb4d..684f0f40b 100644
--- a/utilities/ovn-nbctl.c
+++ b/utilities/ovn-nbctl.c
@@ -124,18 +124,33 @@ static char * OVS_WARN_UNUSED_RESULT main_loop(const char
*args,
static void server_loop(struct ovsdb_idl *idl, int argc, char *argv[]);
int
-main(int argc, char *argv[])
+main(int argc, char *argv_[])
{
struct ovsdb_idl *idl;
struct shash local_options;
-set_program_name(argv[0]);
+set_program_name(argv_[0]);
fatal_ignore_sigpipe();
vlog_set_levels(NULL, VLF_CONSOLE, VLL_WARN);
vlog_set_levels_from_string_assert("reconnect:warn");
nbctl_cmd_init();
+/* Check if options are set via env var. */
+char *ctl_options = getenv("OVN_NBCTL_OPTIONS");
+char **argv;
+int *argcp;
+argcp = xmalloc(sizeof(int));
+*argcp = argc;
+argv = ovs_cmdl_env_parse_all(argcp, argv_,
+ ctl_options);
+if (!argv) {
+/* This situation should never occur, but... */
+ctl_fatal("Unable to read argv");
+}
+argc = *argcp;
+free(argcp);
+
/* ovn-nbctl has three operation modes:
*
*- Direct: Executes commands by contacting ovsdb-server directly.
diff --git a/utilities/ovn-sbctl.8.in b/utilities/ovn-sbctl.8.in
index 2aaa457e8..b3c21d625 100644
--- a/utilities/ovn-sbctl.8.in
+++ b/utilities/ovn-sbctl.8.in
@@ -93,6 +93,14 @@ to approximately \fIsecs\fR seconds. If the timeout expires,
would normally happen only if the database cannot be contacted, or if
the system is overloaded.)
.
+.IP "\fBOVN_SBCTL_OPTIONS\fR"
+.User can set one or more options using \fBOVN_SBCTL_OPTIONS\fR environment
+.variable. Under the Bourne shell this might be done like this:
+.export \fBOVN_SBCTL_OPTIONS\fR"="--db=unix:sb1.ovsdb --no-leader-only".
+.However user can still over-ride environment options by passing different
+.options in cli. When the environment variable is no longer needed, unset it,
+.e.g.: unset \fBOVN_SBCTL_OPTIONS\fR"
+.
.so lib/vlog.man
.so lib/common.man
.
diff --git a/utilities/ovn-sbctl.c b/utilities/ovn-sbctl.c
index 9a9b6f0ec..7c991a5fc 100644
--- a/utilities/ovn-sbctl.c
+++ b/utilities/ovn-sbctl.c
@@ -93,7 +93,7 @@ static bool do_sbctl(const char *args, struct ctl_command *,
size_t n,
struct ovsdb_idl *);
int
-main(int argc, char *argv[])
+main(int argc, char *argv_[])
{
struct ovsdb_idl *idl;
struct ctl_command *commands;
@@ -101,13 +101,28 @@ main(int argc, char *argv[])
unsigned int seqno;
size_t n_commands;
-set_program_name(argv[0]);
+set_program_name(argv_[0]);
fatal_ignore_sigpipe();
vlog_set_levels(NULL, VLF_CONSOLE, VLL_WARN);
vlog_set_levels_from_string_assert("reconnect:warn");
sbctl_cmd_init();
+/* Check if options are set via env var. */
+char *ctl_options = getenv("OVN_SBCTL_OPTIONS");
+char **argv;
+int *argcp;
+argcp = xmalloc(sizeof(int));
+*argcp = argc;
+argv = ovs_cmdl_env_parse_all(argcp, argv_,
+ ctl_options);
+if (!argv) {
+/* This situation should never occur, but... */
+ctl_fatal("Unable to read argv");
+
