Merge branch 'dev' of https://github.com/ConPaaS-team/conpaas into dev

conpaas-director/cpsdirector/service.py

@@ -279,9 +279,16 @@ def stop(serviceid):
     if not service:
         return build_response(simplejson.dumps(False))
 
-    # Try to cleanly terminate the service by calling the manager
+    # Try to cleanly terminate the service
     try:
-        callmanager(serviceid, "delete", True, {})
+        # If the service is in INIT or STOPPED state, we can just kill
+        # the manager VM
+        res = callmanager(serviceid, "get_service_info", False, {})
+        if res['state'] == 'INIT' or res['state'] == 'STOPPED':
+            service.stop()
+        else:
+            # Else, we should ask the manager to cleanly shut down itself
+            callmanager(serviceid, "delete", True, {})
     # If this fails, forcefully terminate the manager VM
     except:
         service.stop()

conpaas-services/src/conpaas/core/controller.py

@@ -204,7 +204,7 @@ def create_nodes(self, count, test_agent, port, cloud=None, inst_type=None):
                 if self.role == 'manager':
                     role_abbr = 'mgr'
                 else:
-                    role_abbr = 'agn'
+                    role_abbr = 'agt'
 
                 # eg: conpaas-online-u3-s1-xtreemfs-mgr
                 name = "%s-u%s-s%s-%s-%s" % (self.__conpaas_name, self.__conpaas_user_id,