Include the Tower venv in the isolated bubblewrapped arguments.

This moves the container-based code location and venvs.
The goal here is that the paths of Tower source for isolated
vs normal nodes matches (both in prod and local development) so that we
don't have to add a bunch of additional bwrap argument logic for
<location-of-isolated-tower-venv>.
This commit is contained in:
Ryan Petrello
2017-06-19 11:15:16 -04:00
parent ba22b3426d
commit 2ba9e56033
4 changed files with 10 additions and 10 deletions

View File

@@ -11,7 +11,7 @@ services:
image: gcr.io/ansible-tower-engineering/tower_isolated:${TAG}
hostname: isolated
volumes:
- "../awx/main/isolated:/tower_isolated"
- "../awx/main/isolated:/tower_devel"
- "../awx/lib:/tower_lib"
- "/sys/fs/cgroup:/sys/fs/cgroup:ro"
privileged: true

View File

@@ -1,3 +1,3 @@
#!/bin/bash
. /venv/tower_isolated/bin/activate
exec env TOWER_LIB_DIRECTORY=/tower_lib /tower_isolated/run.py "$@"
. /venv/tower/bin/activate
exec env TOWER_LIB_DIRECTORY=/tower_lib /tower_devel/run.py "$@"