Merge branch '2.3' into 2.4

maxctrl/lib/cluster.js

@@ -178,9 +178,8 @@ exports.builder = function(yargs) {
                  })
         .command('sync <target>', 'Synchronize the cluster with target MaxScale server.', function(yargs) {
             return yargs.epilog('This command will alter all MaxScale instances given in the --hosts ' +
-                                'option to represent the <target> MaxScale. If the synchronization of ' +
-                                'a MaxScale instance fails, it will be disabled by executing the `stop maxscale` ' +
-                                'command on that instance. Synchronization can be attempted again if a previous ' +
+                                'option to represent the <target> MaxScale. Value of <target> ' +
+                                'must be in HOST:PORT format. Synchronization can be attempted again if a previous ' +
                                 'attempt failed due to a network failure or some other ephemeral error. Any other ' +
                                 'errors require manual synchronization of the MaxScale configuration files and a ' +
                                 'restart of the failed Maxscale.\n\n' +

maxctrl/lib/common.js

@@ -361,7 +361,12 @@ module.exports = function() {
         args.auth = {user: argv.u, pass: argv.p}
         args.json = true
         args.timeout = this.argv.timeout
-        setTlsCerts(args)
+
+        try {
+            setTlsCerts(args)
+        } catch (err) {
+            return error('Failed to set TLS certificates: ' + JSON.stringify(err, null, 4))
+        }
 
         return request(args)
             .then(function(res) {

maxctrl/lib/core.js

@@ -56,7 +56,7 @@ program
     })
     .option('q', {
         alias: 'quiet',
-        describe: 'Silence all output',
+        describe: 'Silence all output. This option is not used in the interactive mode.',
         default: false,
         type: 'boolean'
     })
@@ -123,7 +123,19 @@ program
             base_opts = ['--user=' + argv.user,
                         '--password=' + argv.password,
                         '--hosts=' + argv.hosts,
-                        '--timeout=' + argv.timeout]
+                        '--timeout=' + argv.timeout,
+                        '--tsv=' + argv.tsv,
+                        '--secure=' + argv.secure,
+                        '--tls-verify-server-cert=' + argv['tls-verify-server-cert']]
+
+            // Only set the string options if they are defined, otherwise we'll end up with the value as
+            // the string 'undefined'
+            for (i of ['tls-key', 'tls-cert', 'tls-passphrase', 'tls-ca-cert']) {
+                if (argv[i]) {
+                    base_opts.push('--' + i + '=' + argv[i])
+                }
+            }
+
             return askQuestion()
         } else {
             maxctrl(argv, function() {