Allow docker driver configs to be updated properly. Closes #667.

CSCfi · Nov 16, 2017 · df8625a · df8625a
1 parent d3910da
commit df8625a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/pebbles/static/js/controllers/DashboardController.js b/pebbles/static/js/controllers/DashboardController.js
@@ -365,7 +365,7 @@ app.controller('ModalDestroyInstanceController', function($scope, $modalInstance
 app.controller('DriverConfigController', ['$scope', 'Restangular',
                               function ($scope,   Restangular) {
 
-        $scope.panel_open = false;
+        $scope.panel_open = true;
 
         $scope.toggleStatusOpen = function() {
              if ($scope.panel_open){
@@ -395,11 +395,7 @@ app.controller('DriverConfigController', ['$scope', 'Restangular',
             }).then( function(){
                    fetchDriverConfigs();     
             }, function(response){
-                   if (response.status == 409) {
-                        $.notify({title: 'Outdated Config Found:', message: 'Loading the latest config'}, {type: 'danger'});
-                   } else {
-                       console.log('error while updating the driver specific variable');
-                   }
+                  console.log('error while updating the driver specific variable');
                   fetchDriverConfigs();
             });
         };

diff --git a/pebbles/views/namespaced_keyvalues.py b/pebbles/views/namespaced_keyvalues.py
@@ -112,10 +112,10 @@ def put(self, namespace, key):
             logging.warn("no NamespacedKeyValue object found for namespace %s with key %s" % (namespace, key))
             abort(404)
         # Check for concurrency
-        namespaced_keyvalue_updated = namespaced_keyvalue_query.filter_by(updated_ts=updated_version_ts).first()
-        if not namespaced_keyvalue_updated:
-            logging.warn("trying to modify an outdated record")
-            return {'error': 'CONCURRENT_MODIFICATION_EXCEPTION'}, 409
+        #namespaced_keyvalue_updated = namespaced_keyvalue_query.filter_by(updated_ts=updated_version_ts).first()
+        #if not namespaced_keyvalue_updated:
+        #    logging.warn("trying to modify an outdated record")
+        #    return {'error': 'CONCURRENT_MODIFICATION_EXCEPTION'}, 409
 
         curr_ts = round(time.time(), 2)
         namespaced_keyvalue.updated_ts = curr_ts