From 386aa898ecf3864fa7363f1b32c8069368831880 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Fri, 7 Jan 2022 16:10:27 -0500 Subject: [PATCH] Remove the make init target we want to fold that in to bootstrap_environment.sh. --- Makefile | 19 ------------------- tools/docker-compose/bootstrap_development.sh | 7 ++++--- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index ce82634869..bbc7cbc374 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,6 @@ COLLECTION_VERSION := $(shell $(PYTHON) setup.py --version | cut -d . -f 1-3) # NOTE: This defaults the container image version to the branch that's active COMPOSE_TAG ?= $(GIT_BRANCH) -COMPOSE_HOST ?= $(shell hostname) MAIN_NODE_TYPE ?= hybrid VENV_BASE ?= /var/lib/awx/venv @@ -145,24 +144,6 @@ version_file: fi; \ $(PYTHON) -c "import awx; print(awx.__version__)" > /var/lib/awx/.awx_version; \ -# Do any one-time init tasks. -comma := , -init: - if [ "$(VENV_BASE)" ]; then \ - . $(VENV_BASE)/awx/bin/activate; \ - fi; \ - $(MANAGEMENT_COMMAND) provision_instance --hostname=$(COMPOSE_HOST) --node_type=$(MAIN_NODE_TYPE); \ - $(MANAGEMENT_COMMAND) register_queue --queuename=controlplane --instance_percent=100;\ - $(MANAGEMENT_COMMAND) register_queue --queuename=default --instance_percent=100; - 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; \ - for node in $(RECEPTOR_MUTUAL_TLS); do \ - receptor --cert-makereq bits=2048 commonname="$$node test cert" dnsname=$$node nodeid=$$node outreq=/etc/receptor/certs/$$node.csr outkey=/etc/receptor/certs/$$node.key; \ - receptor --cert-signreq req=/etc/receptor/certs/$$node.csr cacert=/etc/receptor/certs/ca.crt cakey=/etc/receptor/certs/ca.key outcert=/etc/receptor/certs/$$node.crt verify=yes; \ - done; \ - fi - # Refresh development environment after pulling new code. refresh: clean requirements_dev version_file develop migrate diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh index c33559c155..5d4f2c34a3 100755 --- a/tools/docker-compose/bootstrap_development.sh +++ b/tools/docker-compose/bootstrap_development.sh @@ -19,9 +19,6 @@ else wait-for-migrations fi -make init - - if output=$(awx-manage createsuperuser --noinput --username=admin --email=admin@localhost 2> /dev/null); then echo $output admin_password=$(openssl rand -base64 12) @@ -35,6 +32,10 @@ mkdir -p /awx_devel/awx/public/static mkdir -p /awx_devel/awx/ui/static mkdir -p /awx_devel/awx/ui/build/static +awx-manage provision_instance --hostname="$(hostname)" --node_type="$MAIN_NODE_TYPE" +awx-manage register_queue --queuename=controlplane --instance_percent=100 +awx-manage register_queue --queuename=default --instance_percent=100 + # Create resource entries when using Minikube if [[ -n "$MINIKUBE_CONTAINER_GROUP" ]]; then awx-manage shell < /awx_devel/tools/docker-compose-minikube/_sources/bootstrap_minikube.py