deprecate converge_controller

Author: Gabriel Monroy

api/models.py

@@ -199,22 +199,19 @@ def destroy(self, *args, **kwargs):
         group(layer_tasks).apply_async().join()
         CM.purge_formation(self.flat())
         self.delete()
-        tasks.converge_controller.apply_async().wait()
 
     def publish(self):
         data = self.calculate()
         CM.publish_formation(self.flat(), data)
         return data
 
-    def converge(self, controller=False, **kwargs):
+    def converge(self, **kwargs):
         databag = self.publish()
         nodes = self.node_set.all()
         subtasks = []
         for n in nodes:
             subtask = tasks.converge_node.si(n)
             subtasks.append(subtask)
-        if controller is True:
-            subtasks.append(tasks.converge_controller.si())
         group(*subtasks).apply_async().join()
         return databag
 

api/tasks.py

@@ -99,12 +99,3 @@ def run_node(node, command):
     if rc != 0 and 'failed to setup the container' in output:
         output = '\033[35mPlease run `git push deis master` first.\033[0m\n' + output
     return output, rc
-
-
-@task
-def converge_controller():
-    """
-    Converge a the controller node, aligning it with an intended configuration.
-    """
-    CM.converge_controller()
-    return None

api/views.py

@@ -186,9 +186,6 @@ class KeyViewSet(OwnerViewSet):
     serializer_class = serializers.KeySerializer
     lookup_field = 'id'
 
-    def post_save(self, key, created=False, **kwargs):
-        tasks.converge_controller.apply_async().wait()
-
 
 class ProviderViewSet(OwnerViewSet):
     """RESTful views for :class:`~api.models.Provider`."""
@@ -379,7 +376,6 @@ def create(self, request, **kwargs):
         user = get_object_or_404(User, username=request.DATA['username'])
         assign_perm(self.perm, user, app)
         app.publish()
-        tasks.converge_controller.apply_async().wait()
         models.log_event(app, "User {} was granted access to {}".format(user, app))
         return Response(status=status.HTTP_201_CREATED)
 
@@ -391,7 +387,6 @@ def destroy(self, request, **kwargs):
         if user.has_perm(self.perm, app):
             remove_perm(self.perm, user, app)
             app.publish()
-            tasks.converge_controller.apply_async().wait()
             models.log_event(app, "User {} was revoked access to {}".format(user, app))
             return Response(status=status.HTTP_204_NO_CONTENT)
         else:

cm/chef.py

@@ -158,25 +158,6 @@ def purge_node(node):
         raise RuntimeError("Could not purge node client {node_id}: {body}".format(**locals()))
 
 
-def converge_controller():
-    """
-    Converge this controller node.
-
-    "Converge" means to change a node's configuration to match that defined by
-    configuration management.
-
-    :returns: the output of the convergence command, in this case `sudo chef-client`
-    """
-    #try:
-    #    # we only need to run the gitosis recipe to update `git push` ACLs
-    #    return subprocess.check_output(['sudo', 'chef-client', '-o', 'recipe[deis::gitosis]'])
-    #except subprocess.CalledProcessError as err:
-    #    print(err)
-    #    print(err.output)
-    #    raise err
-    pass  # TODO: replace this with new key lookup
-
-
 def converge_node(node):
     """
     Converge a node.

cm/mock.py

@@ -144,17 +144,3 @@ def purge_formation(formation):
     """
     path = os.path.join(settings.TEMPDIR, 'formation-{id}'.format(**formation))
     os.remove(path)
-
-
-def converge_controller():
-    """
-    Converge this controller node.
-
-    "Converge" means to change a node's configuration to match that defined by
-    configuration management.
-
-    This is a no-op for the mock provider.
-
-    :returns: the output of the convergence command, in this case None
-    """
-    return None

docs/server/api.tasks.rst

@@ -19,4 +19,3 @@ api.tasks
     .. autofunction:: destroy_node(node)
     .. autofunction:: converge_node(node)
     .. autofunction:: run_node(node, command)
-    .. autofunction:: converge_controller()