diff --git a/awx/main/management/commands/register_queue.py b/awx/main/management/commands/register_queue.py index 6a99d11849..e65b5af63e 100644 --- a/awx/main/management/commands/register_queue.py +++ b/awx/main/management/commands/register_queue.py @@ -104,7 +104,7 @@ class Command(BaseCommand): changed3 = False (ig, created, changed1) = self.get_create_update_instance_group(queuename, inst_per, inst_min) if created: - print(six.text_type("Creating instance group {}".format(ig.name))) + print(six.text_type("Creating instance group {}").format(ig.name)) elif not created: print(six.text_type("Instance Group already registered {}").format(ig.name)) @@ -126,4 +126,3 @@ class Command(BaseCommand): if instance_not_found_err: print(instance_not_found_err.message) sys.exit(1) - diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py index d5e718fc4c..0a0f4e2599 100644 --- a/awx/main/models/ha.py +++ b/awx/main/models/ha.py @@ -152,10 +152,6 @@ class Instance(HasPolicyEditsMixin, BaseModel): self.save(update_fields=['capacity', 'version', 'modified', 'cpu', 'memory', 'cpu_capacity', 'mem_capacity']) - def clean_hostname(self): - return self.hostname - - class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin): """A model representing a Queue/Group of AWX Instances.""" @@ -222,8 +218,6 @@ class InstanceGroup(HasPolicyEditsMixin, BaseModel, RelatedJobsMixin): class Meta: app_label = 'main' - def clean_name(self): - return self.name def fit_task_to_most_remaining_capacity_instance(self, task): instance_most_capacity = None