16580: remove more references to Nodemanager.

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index a2a34448f11cced6b01a6343eb56acc314e5556c..270d4045b5aaa395ee9b5c749763a601f35e1b6b 100644 (file)
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -139,9 +139,6 @@ Clusters:
       Workbench2:
         InternalURLs: {}
         ExternalURL: ""
       Workbench2:
         InternalURLs: {}
         ExternalURL: ""

-      Nodemanager:
-        InternalURLs: {}
-        ExternalURL: "-"

       Health:
         InternalURLs: {}
         ExternalURL: "-"
       Health:
         InternalURLs: {}
         ExternalURL: "-"

diff --git a/lib/config/deprecated.go b/lib/config/deprecated.go
index 1be7208ee38facce00e71f2cfdf07885ccffde08..0552b66adb80bed162ee3f2518a1c649c0c89ec2 100644 (file)
--- 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"`
        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"`
        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 bddb5cedb1df8428024f6461ed52ede12d8b9607..0241673aa550e5c783a04d875e92bd588eab091f 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -145,9 +145,6 @@ Clusters:
       Workbench2:
         InternalURLs: {}
         ExternalURL: ""
       Workbench2:
         InternalURLs: {}
         ExternalURL: ""

-      Nodemanager:
-        InternalURLs: {}
-        ExternalURL: "-"

       Health:
         InternalURLs: {}
         ExternalURL: "-"
       Health:
         InternalURLs: {}
         ExternalURL: "-"

diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 9cf1ed3cd182ba8f8659b38dee81bcf0a52ab976..c21addbba99284e5ad3e634e24e75e5deac9558e 100644 (file)
--- 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
        Keepbalance    Service
        Keepproxy      Service
        Keepstore      Service

-       Nodemanager    Service

        RailsAPI       Service
        SSO            Service
        WebDAVDownload 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"
        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"
        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,
                ServiceNameController:    svcs.Controller,
                ServiceNameDispatchCloud: svcs.DispatchCloud,
                ServiceNameHealth:        svcs.Health,

-               ServiceNameNodemanager:   svcs.Nodemanager,

                ServiceNameWorkbench1:    svcs.Workbench1,
                ServiceNameWorkbench2:    svcs.Workbench2,
                ServiceNameWebsocket:     svcs.Websocket,
                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 f4b0a994366db603ba0284cb76f4a6573ff266c7..2acf3e59ab81ae10ff816577f5f33fdaea8b9922 100644 (file)
--- 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.Keepproxy,
                &svcs.Keepstore,
                &svcs.Health,

-               &svcs.Nodemanager,

                &svcs.RailsAPI,
                &svcs.WebDAV,
                &svcs.Websocket,
                &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 b54e8d9de64f970726dc49d07ca47e368491986a..9fa3febe1e75fddf4227fae9801cda7d976b4149 100644 (file)
--- 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
 
     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)
     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 2c49dcae62f1a30be179735e15d42a6b1e148934..463c552c4f1eb5caf0868337858197a747bc8fa8 100644 (file)
--- 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))
 
                 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.
 
     def _recommend_ram(self):
         """Recommend an economical RAM constraint for this job.