[incubator-openwhisk] branch master updated: Fix ansible script for distributed environment (#2557)

[ho...@apache.org]

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 28d2a68  Fix ansible script for distributed environment (#2557)
28d2a68 is described below

commit 28d2a68dcc4d8a8cf52f8cef4880045596f03cbb
Author: Sang Heon Lee <de...@gmail.com>
AuthorDate: Thu Aug 10 23:00:36 2017 +0900

    Fix ansible script for distributed environment (#2557)
    
    * Fix ansible script for distributed environment
    
    * Add limits config in distributed environment
---
 ansible/environments/distributed/group_vars/all      | 12 +++++++++++-
 ansible/environments/distributed/hosts               |  2 ++
 ansible/roles/cli/tasks/copy_local_openwhisk_cli.yml |  2 +-
 ansible/roles/cli/tasks/deploy.yml                   |  4 ----
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ansible/environments/distributed/group_vars/all b/ansible/environments/distributed/group_vars/all
index 85f4405..1b4726d 100755
--- a/ansible/environments/distributed/group_vars/all
+++ b/ansible/environments/distributed/group_vars/all
@@ -22,6 +22,16 @@ registry:
     threshold: 80
     keeptags: 5
 
+limits:
+  actions:
+    invokes:
+      perMinute: 60
+      concurrent: 30
+      concurrentInSystem: 5000
+  triggers:
+    fires:
+      perMinute: 60
+
 # openstack vars
 # TODO, should move these to a role and create a designated "defaults.yml" file
 rc_file:
@@ -72,5 +82,5 @@ instances:
 # API GW connection configuration
 apigw_auth_user: ""
 apigw_auth_pwd: ""
-apigw_host: "http://{{ groups['edge']|first }}:{{apigateway.port.api}}/v1"
+apigw_host: "http://{{ groups['apigateway']|first }}:{{apigateway.port.api}}/v1"
 apigw_host_v2: "http://{{ groups['apigateway']|first }}:{{apigateway.port.api}}/v2"
diff --git a/ansible/environments/distributed/hosts b/ansible/environments/distributed/hosts
index 2a56b7e..072623d 100755
--- a/ansible/environments/distributed/hosts
+++ b/ansible/environments/distributed/hosts
@@ -10,6 +10,8 @@ ansible ansible_connection=local
 10.3.2.154
 [apigateway:children]
 edge
+[redis:children]
+edge
 [controllers]
 10.3.2.155
 [kafka]
diff --git a/ansible/roles/cli/tasks/copy_local_openwhisk_cli.yml b/ansible/roles/cli/tasks/copy_local_openwhisk_cli.yml
index a219e68..3839ddf 100644
--- a/ansible/roles/cli/tasks/copy_local_openwhisk_cli.yml
+++ b/ansible/roles/cli/tasks/copy_local_openwhisk_cli.yml
@@ -2,7 +2,7 @@
 
 # Copy the cli binaries to Nginx directory
 
-- stat: path={{ openwhisk_cli.local.location }}/{{ item }}
+- local_action: stat path={{ openwhisk_cli.local.location }}/{{ item }}
   register: binary_path
 
 - name: "copy the local binaries from a local directory to Nginx directory"
diff --git a/ansible/roles/cli/tasks/deploy.yml b/ansible/roles/cli/tasks/deploy.yml
index d3e551c..29f529e 100644
--- a/ansible/roles/cli/tasks/deploy.yml
+++ b/ansible/roles/cli/tasks/deploy.yml
@@ -24,8 +24,4 @@
   copy: src={{ openwhisk_cli.local.location }}/content.json dest={{ cli.nginxdir }}/
   when: cli_installation_mode == "local"
 
-- name: "copy the binaries from a local directory to Nginx directory"
-  copy: src={{ openwhisk_cli.local.location }}/content.json dest={{ cli.nginxdir }}/
-  when: cli_installation_mode == "local"
-
 - include: download_cli.yml

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