[incubator-openwhisk] branch master updated: eliminate setting of COMPONENT_NAME (#3932)

[dubeejw]

This is an automated email from the ASF dual-hosted git repository.

dubeejw 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 263a505  eliminate setting of COMPONENT_NAME (#3932)
263a505 is described below

commit 263a505f2e6963992e62bb5e441847f9d2dfc3fd
Author: David Grove <dgrove-...@users.noreply.github.com>
AuthorDate: Wed Aug 1 13:14:23 2018 -0400

    eliminate setting of COMPONENT_NAME (#3932)
    
    Small cleanup: As best as I can tell, this envvar is set when deploying the
    invoker/controller but the value is never actually used.
---
 ansible/roles/controller/tasks/deploy.yml | 1 -
 ansible/roles/invoker/tasks/deploy.yml    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/ansible/roles/controller/tasks/deploy.yml 
b/ansible/roles/controller/tasks/deploy.yml
index 91d132d..b39c7c2 100644
--- a/ansible/roles/controller/tasks/deploy.yml
+++ b/ansible/roles/controller/tasks/deploy.yml
@@ -123,7 +123,6 @@
       "CONTROLLER_INSTANCES": "{{ controller.instances }}"
       "JMX_REMOTE": "{{ jmx.enabled }}"
 
-      "COMPONENT_NAME": "{{ controller_name }}"
       "PORT": 8080
 
       "CONFIG_whisk_info_date": "{{ whisk.version.date }}"
diff --git a/ansible/roles/invoker/tasks/deploy.yml 
b/ansible/roles/invoker/tasks/deploy.yml
index 8e49ab3..6582feb 100644
--- a/ansible/roles/invoker/tasks/deploy.yml
+++ b/ansible/roles/invoker/tasks/deploy.yml
@@ -167,7 +167,6 @@
       "JAVA_OPTS": "-Xmx{{ invoker.heap }} -XX:+CrashOnOutOfMemoryError 
-XX:+UseGCOverheadLimit -XX:ErrorFile=/logs/java_error.log"
       "INVOKER_OPTS": "{{ invoker_args | default(invoker.arguments) }}"
       "JMX_REMOTE": "{{ jmx.enabled }}"
-      "COMPONENT_NAME": "{{ invoker_name }}"
       "PORT": 8080
       "KAFKA_HOSTS": "{{ kafka_connect_string }}"
       "CONFIG_whisk_kafka_replicationFactor": "{{ kafka.replicationFactor | 
default() }}"