From e6f06a95daf78a44da997929918f7b98ee6aca83 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 15 Mar 2021 13:30:31 -0400 Subject: [PATCH] Remove unnecessary code from launch script - Ansible is no longer installed on the control plane - We register the instance / instance group at dispatcher startup --- .../roles/dockerfile/files/launch_awx_task.sh | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/tools/ansible/roles/dockerfile/files/launch_awx_task.sh b/tools/ansible/roles/dockerfile/files/launch_awx_task.sh index 8b9774a477..4df5aefeb7 100755 --- a/tools/ansible/roles/dockerfile/files/launch_awx_task.sh +++ b/tools/ansible/roles/dockerfile/files/launch_awx_task.sh @@ -13,29 +13,4 @@ if [ -n "${AWX_KUBE_DEVEL}" ]; then export SDB_NOTIFY_HOST=$MY_POD_IP fi -source /etc/tower/conf.d/environment.sh - -ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m wait_for -a "host=$DATABASE_HOST port=$DATABASE_PORT" all -ANSIBLE_REMOTE_TEMP=/tmp ANSIBLE_LOCAL_TEMP=/tmp ansible -i "127.0.0.1," -c local -v -m postgresql_db --become-user $DATABASE_USER -a "name=$DATABASE_NAME owner=$DATABASE_USER login_user=$DATABASE_USER login_host=$DATABASE_HOST login_password=$DATABASE_PASSWORD port=$DATABASE_PORT" all - -if [ -z "$AWX_SKIP_MIGRATIONS" ]; then - echo "Running migrations..." - awx-manage migrate --noinput -fi - -if [ -z "$AWX_SKIP_PROVISION_INSTANCE" ]; then - awx-manage provision_instance --hostname=$(hostname) -fi - -if [ -z "$AWX_SKIP_REGISTERQUEUE" ]; then - awx-manage register_queue --queuename=tower --instance_percent=100 -fi - -if [ ! -z "$AWX_ADMIN_USER" ]&&[ ! -z "$AWX_ADMIN_PASSWORD" ]; then - echo "from django.contrib.auth.models import User; User.objects.create_superuser('$AWX_ADMIN_USER', 'root@localhost', '$AWX_ADMIN_PASSWORD')" | awx-manage shell -fi -echo 'from django.conf import settings; x = settings.AWX_TASK_ENV; x["HOME"] = "/var/lib/awx"; settings.AWX_TASK_ENV = x' | awx-manage shell - -unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh) - supervisord -c /etc/supervisord_task.conf