Merge branch '6-better-ratelimiting' into 'master'

[refactor] Removes the damper environment variables and manifest entry.

Closes #34

See merge request !97

nrm/containers.py

@@ -77,7 +77,7 @@ class ContainerManager(object):
                 container_power['profile']['end'] = dict()
             if pp['policy'] != "NONE":
                 container_power['policy'] = pp['policy']
-                container_power['damper'] = pp['damper']
+                container_power['damper'] = manifest.ratelimit
                 container_power['slowdown'] = pp['slowdown']
 
         # Compute hardware bindings
@@ -131,7 +131,7 @@ class ContainerManager(object):
         if container.power.get('policy'):
             environ['LD_PRELOAD'] = self.pmpi_lib
             environ['NRM_TRANSMIT'] = '1'
-            environ['NRM_DAMPER'] = container.power['damper']
+            environ['ARGO_NRM_RATELIMIT'] = container.power['damper']
 
         # monitoring section involves libnrm
         if manifest.is_feature_enabled('monitoring'):

nrm/schemas/manifest.yml

@@ -127,7 +127,6 @@ properties:
         required:
         - profile
         - policy
-        - damper
         - slowdown
         properties:
 # 
@@ -146,13 +145,7 @@ properties:
           profile:
             type: boolean
 # 
-# `damper` is a dampering parameter for the DDCM policy.::
-# 
-          damper:
-            type: number
-            minimum: 0
-# 
-# `slowdown` is a dampering parameter for the DVFS policy.::
+# `slowdown` is a parameter for the DVFS policy.::
 # 
           slowdown:
             type: number