diff options
| author | softwarefactory-project-zuul[bot] <33884098+softwarefactory-project-zuul[bot]@users.noreply.github.com> | 2021-04-05 17:10:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-05 17:10:37 +0200 |
| commit | 9238b6634489989f908bc7afe47715d4ee05524f (patch) | |
| tree | efce08d357cb949b021b27409e0e3607465296e3 /tools | |
| parent | Merge pull request #9777 from nixocio/ui_issue_9770 (diff) | |
| parent | Remove invocation of Ansible from launch script (diff) | |
| download | awx-9238b6634489989f908bc7afe47715d4ee05524f.tar.xz awx-9238b6634489989f908bc7afe47715d4ee05524f.zip | |
Merge pull request #9802 from shanemcd/remove-more-ansible
Remove invocation of Ansible from launch script
This was missed in the initial EE PR. Ansible is no longer installed inside of the web & task containers, causing this to show up in the container logs:
/usr/bin/launch_awx.sh: line 18: ansible: command not found
/usr/bin/launch_awx.sh: line 19: ansible: command not found
Reviewed-by: Ryan Petrello <None>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ansible/roles/dockerfile/files/launch_awx.sh | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/ansible/roles/dockerfile/files/launch_awx.sh b/tools/ansible/roles/dockerfile/files/launch_awx.sh index 7b5e86f0bd..cd9f573533 100755 --- a/tools/ansible/roles/dockerfile/files/launch_awx.sh +++ b/tools/ansible/roles/dockerfile/files/launch_awx.sh @@ -13,13 +13,6 @@ 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 - awx-manage collectstatic --noinput --clear -unset $(cut -d = -f -1 /etc/tower/conf.d/environment.sh) - supervisord -c /etc/supervisord.conf |