openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From houshen...@apache.org
Subject [incubator-openwhisk] branch master updated: Consider mac environment along with docker-machine enviornment (#2455)
Date Wed, 19 Jul 2017 20:28:12 GMT
This is an automated email from the ASF dual-hosted git repository.

houshengbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 1021bfb  Consider mac environment along with docker-machine enviornment (#2455)
1021bfb is described below

commit 1021bfbfd4af0921f0d896dc6c29a67a3f621353
Author: Dominic Kim <style9595@gmail.com>
AuthorDate: Thu Jul 20 05:28:09 2017 +0900

    Consider mac environment along with docker-machine enviornment (#2455)
---
 ansible/roles/cli/tasks/download_cli.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/cli/tasks/download_cli.yml b/ansible/roles/cli/tasks/download_cli.yml
index 2a33bf7..0e9c5c2 100644
--- a/ansible/roles/cli/tasks/download_cli.yml
+++ b/ansible/roles/cli/tasks/download_cli.yml
@@ -10,7 +10,7 @@
     mode=0755
     validate_certs=False
     force=True
-  when: "'environments/docker-machine' not in inventory_dir"
+  when: "'environments/docker-machine' not in inventory_dir and 'environments/mac' not in
inventory_dir"
 
 - name: "download cli (docker-machine) to openwhisk home at {{ openwhisk_home }}"
   local_action: >
@@ -20,4 +20,4 @@
     mode=0755
     validate_certs=False
     force=True
-  when: "'environments/docker-machine' in inventory_dir"
+  when: "'environments/docker-machine' in inventory_dir or 'environments/mac' in inventory_dir"

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Mime
View raw message