From b63313a08bbe099006aa3bb9b40e2365319f21fa Mon Sep 17 00:00:00 2001 From: Marcelo Moreira de Mello Date: Thu, 15 Jul 2021 11:43:20 -0400 Subject: [PATCH] Using awx-manage shell produces a better stdout during bootstrap --- .../minikube/templates/bootstrap_minikube.py.j2 | 4 +++- tools/docker-compose/bootstrap_development.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/docker-compose-minikube/minikube/templates/bootstrap_minikube.py.j2 b/tools/docker-compose-minikube/minikube/templates/bootstrap_minikube.py.j2 index 861ba5e23a..a2f4d70d2d 100644 --- a/tools/docker-compose-minikube/minikube/templates/bootstrap_minikube.py.j2 +++ b/tools/docker-compose-minikube/minikube/templates/bootstrap_minikube.py.j2 @@ -1,8 +1,10 @@ # Create Openshift/Kubernetes credential for Minikube # This script gets called by the bootstrap_development process -# awx-manage shell_plus --quiet < bootstrap_minikube.py +# awx-manage shell < bootstrap_minikube.py from awx.main.utils.encryption import encrypt_field +from awx.main.models import Credential, CredentialType, InstanceGroup +from django.conf import settings NAME = 'Minikube' diff --git a/tools/docker-compose/bootstrap_development.sh b/tools/docker-compose/bootstrap_development.sh index 7b5d26b4cf..67d2941e1f 100755 --- a/tools/docker-compose/bootstrap_development.sh +++ b/tools/docker-compose/bootstrap_development.sh @@ -37,5 +37,5 @@ mkdir -p /awx_devel/awx/ui_next/build/static # Create resource entries when using Minikube if [[ -n "$MINIKUBE_CONTAINER_GROUP" ]]; then - awx-manage shell_plus --quiet < /awx_devel/tools/docker-compose-minikube/_sources/bootstrap_minikube.py + awx-manage shell < /awx_devel/tools/docker-compose-minikube/_sources/bootstrap_minikube.py fi