From b09da4883517642f78cf626b4f699e865a5213b2 Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Tue, 13 Jul 2021 20:23:19 -0400 Subject: [PATCH] Remove some diff that we dont want from PoC --- Makefile | 5 ----- awx/api/serializers.py | 4 ---- .../src/screens/InstanceGroup/Instances/InstanceListItem.js | 3 --- 3 files changed, 12 deletions(-) diff --git a/Makefile b/Makefile index c541ab16a4..ca7ada2b61 100644 --- a/Makefile +++ b/Makefile @@ -174,11 +174,6 @@ init: fi; \ $(MANAGEMENT_COMMAND) provision_instance --hostname=$(COMPOSE_HOST); \ $(MANAGEMENT_COMMAND) register_queue --queuename=controlplane --instance_percent=100;\ - if [ "$(AWX_GROUP_QUEUES)" == "tower,thepentagon" ]; then \ - $(MANAGEMENT_COMMAND) provision_instance --hostname=isolated; \ - $(MANAGEMENT_COMMAND) register_queue --queuename='thepentagon' --hostnames=isolated --controller=tower; \ - $(MANAGEMENT_COMMAND) generate_isolated_key > /awx_devel/awx/main/isolated/authorized_keys; \ - fi; if [ ! -f /etc/receptor/certs/awx.key ]; then \ rm -f /etc/receptor/certs/*; \ receptor --cert-init commonname="AWX Test CA" bits=2048 outcert=/etc/receptor/certs/ca.crt outkey=/etc/receptor/certs/ca.key; \ diff --git a/awx/api/serializers.py b/awx/api/serializers.py index eabb94db75..be4d5581e2 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -4773,7 +4773,6 @@ class InstanceSerializer(BaseSerializer): percent_capacity_remaining = serializers.SerializerMethodField() jobs_running = serializers.IntegerField(help_text=_('Count of jobs in the running or waiting state that ' 'are targeted for this instance'), read_only=True) jobs_total = serializers.IntegerField(help_text=_('Count of all jobs that target this instance'), read_only=True) - is_receptor = serializers.SerializerMethodField() class Meta: model = Instance @@ -4818,9 +4817,6 @@ class InstanceSerializer(BaseSerializer): else: return float("{0:.2f}".format(((float(obj.capacity) - float(obj.consumed_capacity)) / (float(obj.capacity))) * 100)) - def get_is_receptor(self, obj): - return obj.is_receptor() - class InstanceGroupSerializer(BaseSerializer): diff --git a/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js b/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js index 461d66ca4a..442f3b464f 100644 --- a/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js +++ b/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js @@ -65,9 +65,6 @@ function InstanceListItem({ const labelId = `check-action-${instance.id}`; function usedCapacity(item) { - if (!item.is_receptor) { - return ``; - } if (item.enabled) { return (