aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSawyer Bergeron <sbergeron@iol.unh.edu>2020-07-28 18:23:36 -0400
committerSawyer Bergeron <sbergeron@iol.unh.edu>2020-07-28 18:23:36 -0400
commit50e93d9861aab210cda256cacd88c4ef1af1f1ea (patch)
tree3528025cf5043f284d709dfb1f2af792ca27b194 /src
parentaddc7325e82f7b011180219b6d218798780b7180 (diff)
Fixes for prod deploy
broken configstate causes hosts not to power on when they should vlan manager needs to actually return allocated vlans Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu> Change-Id: I1060a6599fb44bd2ca239d35fbf7e69d13f499a6
Diffstat (limited to 'src')
-rw-r--r--src/account/models.py2
-rw-r--r--src/api/models.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/account/models.py b/src/account/models.py
index 5d83ddf..6828ee1 100644
--- a/src/account/models.py
+++ b/src/account/models.py
@@ -108,6 +108,8 @@ class VlanManager(models.Model):
if len(allocated) != count:
raise ResourceAvailabilityException("can't allocate the vlans requested")
+ return allocated
+
def get_public_vlan(self):
"""Return reference to an available public network without reserving it."""
return PublicNetwork.objects.filter(lab=self.lab_set.first(), in_use=False).first()
diff --git a/src/api/models.py b/src/api/models.py
index 960fc26..ce62ea5 100644
--- a/src/api/models.py
+++ b/src/api/models.py
@@ -384,7 +384,7 @@ class Job(models.Model):
class TaskConfig(models.Model):
- state = models.IntegerField(default=ConfigState.CLEAN)
+ state = models.IntegerField(default=ConfigState.NEW)
keys = set() # TODO: This needs to be an instance variable, not a class variable
delta_keys_list = models.CharField(max_length=200, default="[]")