diff --git a/controller-vtep/ovn-controller-vtep.8.xml b/controller-vtep/ovn-controller-vtep.8.xml index 6aec43fa7d..89acae7edb 100644 --- a/controller-vtep/ovn-controller-vtep.8.xml +++ b/controller-vtep/ovn-controller-vtep.8.xml @@ -28,11 +28,6 @@ -

Other Options

- -

- -

Configuration

ovn-controller-vtep retrieves its configuration diff --git a/controller-vtep/ovn-controller-vtep.c b/controller-vtep/ovn-controller-vtep.c index 698511482e..4472e52853 100644 --- a/controller-vtep/ovn-controller-vtep.c +++ b/controller-vtep/ovn-controller-vtep.c @@ -58,9 +58,6 @@ static char *vtep_remote; static char *ovnsb_remote; static char *default_db_; -/* --unixctl-path: Path to use for unixctl server socket. */ -static char *unixctl_path; - /* Returns true if the northd internal version stored in SB_Global * and ovn-controller-vtep internal version match. */ @@ -121,7 +118,7 @@ main(int argc, char *argv[]) daemonize_start(false, false); - char *abs_unixctl_path = get_abs_unix_ctl_path(unixctl_path); + char *abs_unixctl_path = get_abs_unix_ctl_path(NULL); retval = unixctl_server_create(abs_unixctl_path, &unixctl); free(abs_unixctl_path); @@ -290,7 +287,6 @@ parse_options(int argc, char *argv[]) {"vtep-db", required_argument, NULL, 'D'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, - {"unixctl", required_argument, NULL, 'u'}, VLOG_LONG_OPTIONS, OVN_DAEMON_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS, @@ -326,10 +322,6 @@ parse_options(int argc, char *argv[]) ovn_print_version(OFP13_VERSION, OFP13_VERSION); exit(EXIT_SUCCESS); - case 'u': - unixctl_path = optarg; - break; - VLOG_OPTION_HANDLERS OVN_DAEMON_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS @@ -372,7 +364,6 @@ Options:\n\ (default: %s)\n\ --ovnsb-db=DATABASE connect to ovn-sb database at DATABASE\n\ (default: %s)\n\ - -u, --unixctl=SOCKET set control socket name\n\ -h, --help display this help message\n\ -o, --options list available options\n\ -V, --version display version information\n\ diff --git a/controller/ovn-controller.8.xml b/controller/ovn-controller.8.xml index bcae4617e6..faefa77b9a 100644 --- a/controller/ovn-controller.8.xml +++ b/controller/ovn-controller.8.xml @@ -47,8 +47,7 @@

Other Options

- -

+ diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c index 3d7e34a4fd..384744e6d3 100644 --- a/controller/ovn-controller.c +++ b/controller/ovn-controller.c @@ -137,9 +137,6 @@ static const char *ssl_private_key_file; static const char *ssl_certificate_file; static const char *ssl_ca_cert_file; -/* --unixctl-path: Path to use for unixctl server socket. */ -static char *unixctl_path; - /* By default don't set an upper bound for the lflow cache and enable auto * trimming above 10K logical flows when reducing cache size by 50%. */ @@ -4833,7 +4830,7 @@ main(int argc, char *argv[]) daemonize_start(true, false); - char *abs_unixctl_path = get_abs_unix_ctl_path(unixctl_path); + char *abs_unixctl_path = get_abs_unix_ctl_path(NULL); retval = unixctl_server_create(abs_unixctl_path, &unixctl); free(abs_unixctl_path); if (retval) { @@ -5955,7 +5952,6 @@ parse_options(int argc, char *argv[]) static struct option long_options[] = { {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, - {"unixctl", required_argument, NULL, 'u'}, VLOG_LONG_OPTIONS, OVN_DAEMON_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS, @@ -5985,10 +5981,6 @@ parse_options(int argc, char *argv[]) printf("SB DB Schema %s\n", sbrec_get_db_version()); exit(EXIT_SUCCESS); - case 'u': - unixctl_path = optarg; - break; - VLOG_OPTION_HANDLERS OVN_DAEMON_OPTION_HANDLERS @@ -6064,7 +6056,6 @@ usage(void) daemon_usage(); vlog_usage(); printf("\nOther options:\n" - " -u, --unixctl=SOCKET set control socket name\n" " -n custom chassis name\n" " -h, --help display this help message\n" " -V, --version display version information\n");