Fix openwhisk client creation
diff --git a/.travis.yml b/.travis.yml
index 72d690f..957ada5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
language: python
sudo: required
+dist: trusty
services:
- docker
cache: pip
diff --git a/src/composer/composer.py b/src/composer/composer.py
index ced32bb..7386890 100644
--- a/src/composer/composer.py
+++ b/src/composer/composer.py
@@ -260,22 +260,24 @@
with open(wskpropsPath) as f:
lines = f.readlines()
+ options = dict(options)
+
for line in lines:
parts = line.strip().split('=')
if len(parts) == 2:
if parts[0] == 'APIHOST':
- apihost = parts[1]
+ options['apihost'] = parts[1]
elif parts[0] == 'AUTH':
- api_key = parts[1]
+ options['api_key'] = parts[1]
if '__OW_API_HOST' in os.environ:
- apihost = os.environ['__OW_API_HOST']
+ options['apihost'] = os.environ['__OW_API_HOST']
if '__OW_API_KEY' in os.environ:
- api_key = os.environ['__OW_API_KEY']
+ options['api_key'] = os.environ['__OW_API_KEY']
- wsk = openwhisk.Client({ 'apihost': apihost, 'api_key': api_key })
+ wsk = openwhisk.Client(options)
wsk.compositions = Compositions(wsk, self)
return wsk
