Revert "Invoke the integration process as service."

Tendrl · Jan 12, 2017 · ce680c7 · ce680c7
1 parent 0c73747
commit ce680c7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 38 deletions.
diff --git a/tendrl/node_agent/ceph_integration/flows/import_cluster.py b/tendrl/node_agent/ceph_integration/flows/import_cluster.py
@@ -51,6 +51,9 @@ def run(self):
             self.parameters['Package.pkg_type'] = installation_source_type
             self.parameters['Package.name'] = get_package_name(
                 installation_source_type)
+            self.parameters['Node.cmd_str'] = "tendrl-ceph-integration " \
+                                              "--cluster-id %s" % \
+                                              cluster_id
             tendrl_context = "nodes/%s/Tendrl_context/cluster_id" % \
                              curr_node_id
             self.etcd_client.write(tendrl_context, cluster_id)

diff --git a/tendrl/node_agent/gluster_integration/flows/import_cluster.py b/tendrl/node_agent/gluster_integration/flows/import_cluster.py
@@ -48,6 +48,9 @@ def run(self):
             self.parameters['Package.pkg_type'] = installation_source_type
             self.parameters['Package.name'] = get_package_name(
                 installation_source_type)
+            self.parameters['Node.cmd_str'] = "tendrl-gluster-integration " \
+                                              "--cluster-id %s" % \
+                                              cluster_id
             tendrl_context = "nodes/%s/Tendrl_context/cluster_id" % \
                              curr_node_id
             self.etcd_client.write(tendrl_context, cluster_id)

diff --git a/tendrl/node_agent/manager/tendrl_definitions_node_agent.py b/tendrl/node_agent/manager/tendrl_definitions_node_agent.py
@@ -198,6 +198,16 @@
       list: nodes/$Node_context.node_id/Disks/free
     Node:
       atoms:
+        cmd:
+          enabled: true
+          inputs:
+            mandatory:
+              - Node.cmd_str
+          name: "Execute CMD on Node"
+          help: "Executes a command"
+          run: tendrl.node_agent.atoms.node.cmd.Cmd
+          type: Create
+          uuid: dc8fff3a-34d9-4786-9282-55eff6abb6c3
         check_node_up:
           enabled: true
           inputs:
@@ -285,17 +295,6 @@
       enabled: true
     Service:
       atoms:
-        start_integration_service:
-          enabled: true
-          inputs:
-            mandatory:
-              - Tendrl_context.sds_name
-              - Tendrl_context.cluster_id
-          name: "Start integration service on node"
-          help: "starts the integration service on node"
-          run: tendrl.node_agent.atoms.service.start_integration_service.StartIntegrationService
-          type: Create
-          uuid: dc8fff3a-34d9-4786-9282-55eff6abb9c8
         configure:
           enabled: true
           inputs:
@@ -390,7 +389,7 @@
         - tendrl.node_agent.objects.Package.atoms.install
         - tendrl.node_agent.gluster_integration.objects.Config.atoms.generate
         - tendrl.node_agent.objects.File.atoms.write
-        - tendrl.node_agent.objects.Service.atoms.start_integration_service
+        - tendrl.node_agent.objects.Node.atoms.cmd
       help: "Import existing Gluster Cluster"
       enabled: true
       inputs:
@@ -467,7 +466,7 @@
         - tendrl.node_agent.objects.Package.atoms.install
         - tendrl.node_agent.ceph_integration.objects.Config.atoms.generate
         - tendrl.node_agent.objects.File.atoms.write
-        - tendrl.node_agent.objects.Service.atoms.start_integration_service
+        - tendrl.node_agent.objects.Node.atoms.cmd
       help: "Import existing Ceph Cluster"
       enabled: true
       inputs:

diff --git a/tendrl/node_agent/objects/service/__init__.py b/tendrl/node_agent/objects/service/__init__.py
diff --git a/tendrl/node_agent/objects/service/atoms/__init__.py b/tendrl/node_agent/objects/service/atoms/__init__.py
diff --git a/tendrl/node_agent/objects/service/atoms/start_integration_service.py b/tendrl/node_agent/objects/service/atoms/start_integration_service.py