diff --git a/lib/cli.js b/lib/cli.js index 266569f..0c262ae 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -216,10 +216,7 @@ CLI.prototype.init = function (opts, args, callback) { }); self.log.trace({config: config}, 'loaded config'); - var profileName = opts.profile || - config.profile || - process.env.TRITON_PROFILE || - 'env'; + var profileName = opts.profile || config.profile || 'env'; var profile = mod_config.loadProfile({ configDir: self.configDir, name: profileName diff --git a/test/integration/helpers.js b/test/integration/helpers.js index 6b6c29b..af5734f 100644 --- a/test/integration/helpers.js +++ b/test/integration/helpers.js @@ -41,7 +41,8 @@ try { error(' "url": "",'); error(' "account": "",'); error(' "keyId": "",'); - error(' "insecure": true|false // optional'); + error(' "insecure": true|false, // optional'); + error(' "destructiveAllowed": true|false // optional'); error(' }'); error(''); error('Note: This test suite with create machines, images, et al using'); @@ -76,10 +77,10 @@ function triton(args, cb) { HOME: process.env.HOME, SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK, TRITON_PROFILE: 'env', - SDC_URL: CONFIG.url, - SDC_ACCOUNT: CONFIG.account, - SDC_KEY_ID: CONFIG.keyId, - SDC_TLS_INSECURE: CONFIG.insecure + TRITON_URL: CONFIG.url, + TRITON_ACCOUNT: CONFIG.account, + TRITON_KEY_ID: CONFIG.keyId, + TRITON_TLS_INSECURE: CONFIG.insecure } }, log: LOG