Merge pull request #544 from ncharles/ust_4970/dev/4983_remove_HOSTLI…

…CENCESPAID_from_rudder Fixes #4983: remove HOSTLICENCESPAID from Rudder
Normation · Jun 20, 2014 · f98ce44 · f98ce44
2 parents 62eebf1 + 5ea3b77
commit f98ce44
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/...er-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala b/...er-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
@@ -235,18 +235,11 @@ class SystemVariableServiceImpl(
 
     val varNodeRole = systemVariableSpecService.get("NODEROLE").toVariable().copyWithSavedValue(varNodeRoleValue)
 
-    // Set the licences for the Nova
-    val varLicensesPaidValue = if (nodeInfo.agentsName.contains(NOVA_AGENT)) {
-      licenseRepository.findLicense(nodeInfo.policyServerId) match {
-        case None =>
-          logger.warn("Caution, the policy server %s does not have a registered Nova license".format(nodeInfo.policyServerId.value))
-          throw new LicenseException("No license found for the policy server " + nodeInfo.policyServerId.value)
-        case Some(x) => x.licenseNumber.toString
-      }
-    } else {
-      "1"
+    // Check that the policy server have Nova license if the host is a Nova
+    if (nodeInfo.agentsName.contains(NOVA_AGENT) && licenseRepository.findLicense(nodeInfo.policyServerId).isEmpty) {
+      logger.warn("Caution, the policy server %s does not have a registered Nova license".format(nodeInfo.policyServerId.value))
+      throw new LicenseException("No license found for the policy server " + nodeInfo.policyServerId.value)
     }
-    val varLicensesPaid = systemVariableSpecService.get("LICENSESPAID").toVariable().copyWithSavedValue(varLicensesPaidValue)
 
     val authorizedNetworks = policyServerManagementService.getAuthorizedNetworks(nodeInfo.id) match {
       case eb:EmptyBox =>
@@ -301,7 +294,6 @@ class SystemVariableServiceImpl(
          globalSystemVariables
       ++ Map(
              (varNodeRole.spec.name, varNodeRole)
-           , (varLicensesPaid.spec.name, varLicensesPaid)
            , (varAllowedNetworks.spec.name, varAllowedNetworks)
            , (varRudderServerRole.spec.name -> varRudderServerRole)
          )