[ARVADOS] updated: 1.3.0-2853-g4b4431eb7

[Git user]

Summary of changes:
 lib/config/config.default.yml                             | 3 ---
 lib/config/deprecated.go                                  | 1 -
 lib/config/generated_config.go                            | 3 ---
 sdk/go/arvados/config.go                                  | 3 ---
 sdk/go/health/aggregator_test.go                          | 1 -
 services/api/test/unit/node_test.rb                       | 2 +-
 tools/crunchstat-summary/crunchstat_summary/summarizer.py | 2 +-
 7 files changed, 2 insertions(+), 13 deletions(-)

       via  4b4431eb7fbf575789be9c5798b6a3bf43a07396 (commit)
      from  afb2e4f88d30ac60fda89136fd73fecfb74ba5eb (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 4b4431eb7fbf575789be9c5798b6a3bf43a07396
Author: Ward Vandewege <ward at curii.com>
Date:   Mon Aug 17 10:32:31 2020 -0400

    16580: remove more references to Nodemanager.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index a2a34448f..270d4045b 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -139,9 +139,6 @@ Clusters:
       Workbench2:
         InternalURLs: {}
         ExternalURL: ""
-      Nodemanager:
-        InternalURLs: {}
-        ExternalURL: "-"
       Health:
         InternalURLs: {}
         ExternalURL: "-"
diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 1be7208ee..0552b66ad 100644
--- a/lib/config/deprecated.go
+++ b/lib/config/deprecated.go
@@ -43,7 +43,6 @@ type nodeProfile struct {
 	Keepproxy     systemServiceInstance `json:"keepproxy"`
 	Keepstore     systemServiceInstance `json:"keepstore"`
 	Keepweb       systemServiceInstance `json:"keep-web"`
-	Nodemanager   systemServiceInstance `json:"arvados-node-manager"`
 	DispatchCloud systemServiceInstance `json:"arvados-dispatch-cloud"`
 	RailsAPI      systemServiceInstance `json:"arvados-api-server"`
 	Websocket     systemServiceInstance `json:"arvados-ws"`
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index bddb5cedb..0241673aa 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -145,9 +145,6 @@ Clusters:
       Workbench2:
         InternalURLs: {}
         ExternalURL: ""
-      Nodemanager:
-        InternalURLs: {}
-        ExternalURL: "-"
       Health:
         InternalURLs: {}
         ExternalURL: "-"
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 9cf1ed3cd..c21addbba 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -314,7 +314,6 @@ type Services struct {
 	Keepbalance    Service
 	Keepproxy      Service
 	Keepstore      Service
-	Nodemanager    Service
 	RailsAPI       Service
 	SSO            Service
 	WebDAVDownload Service
@@ -567,7 +566,6 @@ const (
 	ServiceNameController    ServiceName = "arvados-controller"
 	ServiceNameDispatchCloud ServiceName = "arvados-dispatch-cloud"
 	ServiceNameHealth        ServiceName = "arvados-health"
-	ServiceNameNodemanager   ServiceName = "arvados-node-manager"
 	ServiceNameWorkbench1    ServiceName = "arvados-workbench1"
 	ServiceNameWorkbench2    ServiceName = "arvados-workbench2"
 	ServiceNameWebsocket     ServiceName = "arvados-ws"
@@ -585,7 +583,6 @@ func (svcs Services) Map() map[ServiceName]Service {
 		ServiceNameController:    svcs.Controller,
 		ServiceNameDispatchCloud: svcs.DispatchCloud,
 		ServiceNameHealth:        svcs.Health,
-		ServiceNameNodemanager:   svcs.Nodemanager,
 		ServiceNameWorkbench1:    svcs.Workbench1,
 		ServiceNameWorkbench2:    svcs.Workbench2,
 		ServiceNameWebsocket:     svcs.Websocket,
diff --git a/sdk/go/health/aggregator_test.go b/sdk/go/health/aggregator_test.go
index f4b0a9943..2acf3e59a 100644
--- a/sdk/go/health/aggregator_test.go
+++ b/sdk/go/health/aggregator_test.go
@@ -157,7 +157,6 @@ func (s *AggregatorSuite) setAllServiceURLs(listen string) {
 		&svcs.Keepproxy,
 		&svcs.Keepstore,
 		&svcs.Health,
-		&svcs.Nodemanager,
 		&svcs.RailsAPI,
 		&svcs.WebDAV,
 		&svcs.Websocket,
diff --git a/services/api/test/unit/node_test.rb b/services/api/test/unit/node_test.rb
index b54e8d9de..9fa3febe1 100644
--- a/services/api/test/unit/node_test.rb
+++ b/services/api/test/unit/node_test.rb
@@ -141,7 +141,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal "custom1", node2.hostname
   end
 
-  test "update dns when nodemanager clears hostname and ip_address" do
+  test "update dns when hostname and ip_address are cleared" do
     act_as_system_user do
       node = ping_node(:new_with_custom_hostname, {})
       Node.expects(:dns_server_update).with(node.hostname, Node::UNUSED_NODE_IP)
diff --git a/tools/crunchstat-summary/crunchstat_summary/summarizer.py b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
index 2c49dcae6..463c552c4 100644
--- a/tools/crunchstat-summary/crunchstat_summary/summarizer.py
+++ b/tools/crunchstat-summary/crunchstat_summary/summarizer.py
@@ -364,7 +364,7 @@ class Summarizer(object):
                 constraint_key,
                 int(used_cores))
 
-    # FIXME: This needs to be updated to account for current nodemanager algorithms
+    # FIXME: This needs to be updated to account for current a-d-c algorithms
     def _recommend_ram(self):
         """Recommend an economical RAM constraint for this job.
 

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


hooks/post-receive
--