[ARVADOS] updated: 8ae04f9f4d252a99985d7ac047413318d2f1068b

[Git user]

Summary of changes:
 apps/workbench/app/controllers/healthcheck_controller.rb               | 2 +-
 apps/workbench/config/application.default.yml                          | 2 +-
 apps/workbench/test/controllers/healthcheck_controller_test.rb         | 2 +-
 services/api/app/controllers/arvados/v1/healthcheck_controller.rb      | 2 +-
 services/api/config/application.default.yml                            | 2 +-
 services/api/test/functional/arvados/v1/healthcheck_controller_test.rb | 2 +-
 services/nodemanager/arvnodeman/config.py                              | 2 +-
 services/nodemanager/arvnodeman/status.py                              | 2 +-
 services/nodemanager/tests/test_status.py                              | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

       via  8ae04f9f4d252a99985d7ac047413318d2f1068b (commit)
      from  286cb3b9021ad74786d7746370594b9bb81d50a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8ae04f9f4d252a99985d7ac047413318d2f1068b
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 28 10:50:58 2017 -0400

    11906: use the same name "ManagementToken" to enable healthcheck in all services
    
    Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika at curoverse.com>

diff --git a/apps/workbench/app/controllers/healthcheck_controller.rb b/apps/workbench/app/controllers/healthcheck_controller.rb
index 8cf6b93..60043d9 100644
--- a/apps/workbench/app/controllers/healthcheck_controller.rb
+++ b/apps/workbench/app/controllers/healthcheck_controller.rb
@@ -16,7 +16,7 @@ class HealthcheckController < ApplicationController
   before_filter :check_auth_header
 
   def check_auth_header
-    mgmt_token = Rails.configuration.management_token
+    mgmt_token = Rails.configuration.ManagementToken
     auth_header = request.headers['Authorization']
 
     if !mgmt_token
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 8b9bf15..9f6c1ed 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -298,4 +298,4 @@ common:
 
   # Token to be included in all healthcheck requests. Disabled by default.
   # Workbench expects request header of the format "Authorization: Bearer xxx"
-  management_token: false
+  ManagementToken: false
diff --git a/apps/workbench/test/controllers/healthcheck_controller_test.rb b/apps/workbench/test/controllers/healthcheck_controller_test.rb
index 9254593..9a63a29 100644
--- a/apps/workbench/test/controllers/healthcheck_controller_test.rb
+++ b/apps/workbench/test/controllers/healthcheck_controller_test.rb
@@ -13,7 +13,7 @@ class HealthcheckControllerTest < ActionController::TestCase
     [true, 'Bearer configuredmanagementtoken', 200, '{"health":"OK"}'],
   ].each do |enabled, header, error_code, error_msg|
     test "ping when #{if enabled then 'enabled' else 'disabled' end} with header '#{header}'" do
-      Rails.configuration.management_token = 'configuredmanagementtoken' if enabled
+      Rails.configuration.ManagementToken = 'configuredmanagementtoken' if enabled
 
       @request.headers['Authorization'] = header
       get :ping
diff --git a/services/api/app/controllers/arvados/v1/healthcheck_controller.rb b/services/api/app/controllers/arvados/v1/healthcheck_controller.rb
index 3986af9..6d55506 100644
--- a/services/api/app/controllers/arvados/v1/healthcheck_controller.rb
+++ b/services/api/app/controllers/arvados/v1/healthcheck_controller.rb
@@ -16,7 +16,7 @@ class Arvados::V1::HealthcheckController < ApplicationController
   before_filter :check_auth_header
 
   def check_auth_header
-    mgmt_token = Rails.configuration.management_token
+    mgmt_token = Rails.configuration.ManagementToken
     auth_header = request.headers['Authorization']
 
     if !mgmt_token
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 8dafd1c..2f32556 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -444,7 +444,7 @@ common:
 
   # Token to be included in all healthcheck requests. Disabled by default.
   # Server expects request header of the format "Authorization: Bearer xxx"
-  management_token: false
+  ManagementToken: false
 
 development:
   force_ssl: false
diff --git a/services/api/test/functional/arvados/v1/healthcheck_controller_test.rb b/services/api/test/functional/arvados/v1/healthcheck_controller_test.rb
index 282bdf1..551eefa 100644
--- a/services/api/test/functional/arvados/v1/healthcheck_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/healthcheck_controller_test.rb
@@ -13,7 +13,7 @@ class Arvados::V1::HealthcheckControllerTest < ActionController::TestCase
     [true, 'Bearer configuredmanagementtoken', 200, '{"health":"OK"}'],
   ].each do |enabled, header, error_code, error_msg|
     test "ping when #{if enabled then 'enabled' else 'disabled' end} with header '#{header}'" do
-      Rails.configuration.management_token = 'configuredmanagementtoken' if enabled
+      Rails.configuration.ManagementToken = 'configuredmanagementtoken' if enabled
 
       @request.headers['Authorization'] = header
       get :ping
diff --git a/services/nodemanager/arvnodeman/config.py b/services/nodemanager/arvnodeman/config.py
index 1c7929b..e47f9fc 100644
--- a/services/nodemanager/arvnodeman/config.py
+++ b/services/nodemanager/arvnodeman/config.py
@@ -59,7 +59,7 @@ class NodeManagerConfig(ConfigParser.SafeConfigParser):
                        'node_mem_scaling': '0.95'},
             'Manage': {'address': '127.0.0.1',
                        'port': '-1',
-                       'management_token': ''},
+                       'ManagementToken': ''},
             'Logging': {'file': '/dev/stderr',
                         'level': 'WARNING'}
         }.iteritems():
diff --git a/services/nodemanager/arvnodeman/status.py b/services/nodemanager/arvnodeman/status.py
index 99b8156..cfd6112 100644
--- a/services/nodemanager/arvnodeman/status.py
+++ b/services/nodemanager/arvnodeman/status.py
@@ -59,7 +59,7 @@ class Handler(http.server.BaseHTTPRequestHandler, object):
         _logger.info(fmt, *args, **kwargs)
 
     def check_auth(self):
-        mgmt_token = self.server._config.get('Manage', 'management_token')
+        mgmt_token = self.server._config.get('Manage', 'ManagementToken')
         auth_header = self.headers.get('Authorization', None)
 
         if mgmt_token == '':
diff --git a/services/nodemanager/tests/test_status.py b/services/nodemanager/tests/test_status.py
index 8762511..a236e4f 100644
--- a/services/nodemanager/tests/test_status.py
+++ b/services/nodemanager/tests/test_status.py
@@ -23,7 +23,7 @@ class TestServer(object):
         cfg.set('Manage', 'port', '0')
         cfg.set('Manage', 'address', '127.0.0.1')
         if self.mgmt_token != None:
-            cfg.set('Manage', 'management_token', self.mgmt_token)
+            cfg.set('Manage', 'ManagementToken', self.mgmt_token)
         self.srv = status.Server(cfg)
         self.srv.start()
         addr, port = self.srv.server_address

-----------------------------------------------------------------------


hooks/post-receive
--