From 67000f0ce9bf8926964c94c113ee7815a10f368a Mon Sep 17 00:00:00 2001 From: "Christian M. Adams" Date: Thu, 22 Oct 2020 16:49:13 -0400 Subject: [PATCH] Remove license_key check & fix docker-compose make command --- Makefile | 2 +- awxkit/awxkit/api/pages/config.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8d891c25b5..3f1b6876e7 100644 --- a/Makefile +++ b/Makefile @@ -650,7 +650,7 @@ awx/projects: docker-compose-isolated: awx/projects CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-isolated-override.yml up -COMPOSE_UP_OPTS ?= "" +COMPOSE_UP_OPTS ?= # Docker Compose Development environment docker-compose: docker-auth awx/projects diff --git a/awxkit/awxkit/api/pages/config.py b/awxkit/awxkit/api/pages/config.py index ae308a673e..92be01d631 100644 --- a/awxkit/awxkit/api/pages/config.py +++ b/awxkit/awxkit/api/pages/config.py @@ -14,7 +14,6 @@ class Config(base.Base): @property def is_valid_license(self): return self.license_info.get('valid_key', False) and \ - 'license_key' in self.license_info and \ 'instance_count' in self.license_info @property