From d6e14903dfe7f1e635a6a356954faf5475e95e0d Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 21 Jan 2021 13:21:10 -0500 Subject: [PATCH] Remove unnecessary configmaps --- roles/awx/tasks/main.yml | 2 - roles/awx/templates/launch_awx.yaml.j2 | 59 ---------- roles/awx/templates/supervisor.yaml.j2 | 149 ------------------------- roles/awx/templates/tower.yaml.j2 | 46 -------- 4 files changed, 256 deletions(-) delete mode 100644 roles/awx/templates/launch_awx.yaml.j2 delete mode 100644 roles/awx/templates/supervisor.yaml.j2 diff --git a/roles/awx/tasks/main.yml b/roles/awx/tasks/main.yml index f98cbfc7..40dfac7b 100644 --- a/roles/awx/tasks/main.yml +++ b/roles/awx/tasks/main.yml @@ -59,8 +59,6 @@ register: k8s_defs_result with_items: - tower_config.yaml.j2 - - launch_awx.yaml.j2 - - supervisor.yaml.j2 - name: Apply Tower Deployment Configuration k8s: diff --git a/roles/awx/templates/launch_awx.yaml.j2 b/roles/awx/templates/launch_awx.yaml.j2 deleted file mode 100644 index 590e63c8..00000000 --- a/roles/awx/templates/launch_awx.yaml.j2 +++ /dev/null @@ -1,59 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ meta.name }}-launch-awx - namespace: {{ meta.namespace }} - labels: - app: awx -data: - launch-awx-task: | - #!/usr/bin/env bash - if [ `id -u` -ge 500 ]; then - echo "awx:x:`id -u`:`id -g`:,,,:/var/lib/awx:/bin/bash" >> /tmp/passwd - cat /tmp/passwd > /etc/passwd - rm /tmp/passwd - 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 wait_for -a "path=/var/run/redis/redis.sock" all - - if [ -z "$AWX_SKIP_MIGRATIONS" ]; then - awx-manage migrate --noinput - 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 - awx-manage create_preload_data - else - echo "from django.contrib.auth.models import User; User.objects.create_superuser('admin', 'root@localhost', 'password')" | awx-manage shell - awx-manage create_preload_data - 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 - awx-manage provision_instance --hostname=$(hostname) - awx-manage register_queue --queuename=tower --instance_percent=100 - - unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh) - - supervisord -c /supervisor_task.conf - - launch-awx-web: | - #!/usr/bin/env bash - if [ `id -u` -ge 500 ]; then - echo "awx:x:`id -u`:`id -g`:,,,:/var/lib/awx:/bin/bash" >> /tmp/passwd - cat /tmp/passwd > /etc/passwd - rm /tmp/passwd - 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 wait_for -a "path=/var/run/redis/redis.sock" all - - awx-manage collectstatic --noinput --clear - - unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh) - - supervisord -c /supervisor.conf diff --git a/roles/awx/templates/supervisor.yaml.j2 b/roles/awx/templates/supervisor.yaml.j2 deleted file mode 100644 index 6570851b..00000000 --- a/roles/awx/templates/supervisor.yaml.j2 +++ /dev/null @@ -1,149 +0,0 @@ ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ meta.name }}-supervisor-config - namespace: {{ meta.namespace }} - labels: - app: awx -data: - supervisor-web-config: | - [supervisord] - nodaemon = True - umask = 022 - logfile = /dev/stdout - logfile_maxbytes = 0 - - [program:nginx] - command = nginx -g "daemon off;" - autostart = true - autorestart = true - stopwaitsecs = 5 - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - stderr_logfile=/dev/stderr - stderr_logfile_maxbytes=0 - - [program:uwsgi] - command = {{ uwsgi_bash }} '/var/lib/awx/venv/awx/bin/uwsgi --socket 127.0.0.1:8050 --module=awx.wsgi:application --vacuum --processes=5 --harakiri=120 --no-orphans --master --max-requests=1000 --master-fifo=/var/lib/awx/awxfifo --lazy-apps -b 32768' - directory = /var/lib/awx - autostart = true - autorestart = true - stopwaitsecs = 15 - stopsignal = INT - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - stderr_logfile=/dev/stderr - stderr_logfile_maxbytes=0 - - [program:daphne] - command = {{ uwsgi_bash }} '/var/lib/awx/venv/awx/bin/daphne -b 127.0.0.1 -p 8051 awx.asgi:channel_layer' - directory = /var/lib/awx - autostart = true - autorestart = true - stopwaitsecs = 5 - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - stderr_logfile=/dev/stderr - stderr_logfile_maxbytes=0 - - [program:wsbroadcast] - command = awx-manage run_wsbroadcast - directory = /var/lib/awx - autostart = true - autorestart = true - stopwaitsecs = 5 - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - stderr_logfile=/dev/stderr - stderr_logfile_maxbytes=0 - - [program:awx-rsyslogd] - command = rsyslogd -n -i /var/run/awx-rsyslog/rsyslog.pid -f /var/lib/awx/rsyslog/rsyslog.conf - autostart = true - autorestart = true - stopwaitsecs = 5 - stopsignal=TERM - stopasgroup=true - killasgroup=true - redirect_stderr=true - stdout_logfile=/dev/stderr - stdout_logfile_maxbytes=0 - - [group:tower-processes] - programs=nginx,uwsgi,daphne,wsbroadcast,awx-rsyslogd - priority=5 - - # TODO: Exit Handler - - [eventlistener:awx-config-watcher] - command=/usr/bin/config-watcher - stderr_logfile=/dev/stdout - stderr_logfile_maxbytes=0 - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - events=TICK_60 - priority=0 - - [unix_http_server] - file=/var/run/supervisor/supervisor.web.sock - - [supervisorctl] - serverurl=unix:///var/run/supervisor/supervisor.web.sock ; use a unix:// URL for a unix socket - - [rpcinterface:supervisor] - supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - - supervisor-task-config: | - [supervisord] - nodaemon = True - umask = 022 - logfile = /dev/stdout - logfile_maxbytes = 0 - - [program:dispatcher] - command = awx-manage run_dispatcher - directory = /var/lib/awx - environment = LANGUAGE="en_US.UTF-8",LANG="en_US.UTF-8",LC_ALL="en_US.UTF-8",LC_CTYPE="en_US.UTF-8" - autostart = true - autorestart = true - stopwaitsecs = 5 - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - stderr_logfile=/dev/stderr - stderr_logfile_maxbytes=0 - - [program:callback-receiver] - command = awx-manage run_callback_receiver - directory = /var/lib/awx - autostart = true - autorestart = true - stopwaitsecs = 5 - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - stderr_logfile=/dev/stderr - stderr_logfile_maxbytes=0 - - [group:tower-processes] - programs=dispatcher,callback-receiver - priority=5 - - # TODO: Exit Handler - - [eventlistener:awx-config-watcher] - command=/usr/bin/config-watcher - stderr_logfile=/dev/stdout - stderr_logfile_maxbytes=0 - stdout_logfile=/dev/stdout - stdout_logfile_maxbytes=0 - events=TICK_60 - priority=0 - - [unix_http_server] - file=/tmp/supervisor.sock - - [supervisorctl] - serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket - - [rpcinterface:supervisor] - supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface diff --git a/roles/awx/templates/tower.yaml.j2 b/roles/awx/templates/tower.yaml.j2 index a3e8bd08..f672a6a8 100644 --- a/roles/awx/templates/tower.yaml.j2 +++ b/roles/awx/templates/tower.yaml.j2 @@ -66,14 +66,6 @@ spec: mountPath: /etc/nginx/nginx.conf subPath: nginx.conf readOnly: true - - name: {{ meta.name }}-launch-awx-web - mountPath: /usr/bin/launch_awx.sh - subPath: launch_awx.sh - readOnly: true - - name: {{ meta.name }}-supervisor-web-config - mountPath: /supervisor.conf - subPath: supervisor.conf - readOnly: true - name: {{ meta.name }}-redis-socket mountPath: "/var/run/redis" - name: supervisor-socket @@ -118,18 +110,6 @@ spec: mountPath: /etc/tower/settings.py subPath: settings.py readOnly: true - - name: {{ meta.name }}-launch-awx-task - mountPath: /usr/bin/launch_awx_task.sh - subPath: launch_awx_task.sh - readOnly: true - - name: {{ meta.name }}-supervisor-web-config - mountPath: "/supervisor.conf" - subPath: supervisor.conf - readOnly: true - - name: {{ meta.name }}-supervisor-task-config - mountPath: /supervisor_task.conf - subPath: supervisor_task.conf - readOnly: true - name: {{ meta.name }}-redis-socket mountPath: "/var/run/redis" - name: supervisor-socket @@ -194,32 +174,6 @@ spec: items: - key: redis_conf path: redis.conf - - name: {{ meta.name }}-launch-awx-web - configMap: - name: '{{meta.name }}-launch-awx' - items: - - key: launch-awx-web - path: launch_awx.sh - defaultMode: 0755 - - name: {{ meta.name }}-supervisor-web-config - configMap: - name: '{{ meta.name }}-supervisor-config' - items: - - key: supervisor-web-config - path: supervisor.conf - - name: {{ meta.name }}-launch-awx-task - configMap: - name: '{{ meta.name }}-launch-awx' - items: - - key: launch-awx-task - path: 'launch_awx_task.sh' - defaultMode: 0755 - - name: {{ meta.name }}-supervisor-task-config - configMap: - name: '{{ meta.name }}-supervisor-config' - items: - - key: supervisor-task-config - path: 'supervisor_task.conf' - name: {{ meta.name }}-redis-socket emptyDir: {} - name: supervisor-socket