External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-23 22:16:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix tower-expect -> awx-expect for isolated tower builds

Browse Source
This commit is contained in:
Ryan Petrello
2017-07-24 16:03:58 -04:00
parent 145caafdc8
commit 8ce1421c6a
14 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/docker-isolated/Dockerfile
View File

@@ -17,7 +17,7 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
WORKDIR /
EXPOSE 22
ADD tools/docker-isolated/tower-expect /usr/local/bin/tower-expect
ADD tools/docker-isolated/awx-expect /usr/local/bin/awx-expect
RUN rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_rsa_key
RUN ssh-keygen -q -N "" -t dsa -f /etc/ssh/ssh_host_ecdsa_key

8
tools/docker-isolated/README.md
View File

@@ -1,7 +1,7 @@
## Instructions on using an isolated node
The building of the isolated node is done in the `make docker-compose-build`
target. Its image uses a different tag from the tools_tower container.
target. Its image uses a different tag from the tools_awx container.
Given that the images are built, you can run the combined docker compose target. This uses
the base `docker-compose.yml` with modifications found in `docker-isolated-override.yml`.
@@ -12,7 +12,7 @@ base branch is. For example:
make docker-isolated COMPOSE_TAG=devel
```
This will automatically exchange the keys in order for the `tools_tower_1`
This will automatically exchange the keys in order for the `tools_awx_1`
container to access the `tools_isolated_1` container over ssh.
After that, it will bring up all the containers like the normal docker-compose
workflow.
@@ -61,7 +61,7 @@ Example location of a private data directory:
The following command would run the playbook corresponding to that job.
```bash
tower-expect start /tmp/ansible_tower_29_OM6Mnx/
awx-expect start /tmp/ansible_tower_29_OM6Mnx/
```
Other tower-expect commands include `start`, `is-alive`, and `stop`.
Other awx-expect commands include `start`, `is-alive`, and `stop`.

3
tools/docker-isolated/awx-expect Executable file
View File

@@ -0,0 +1,3 @@
#!/bin/bash
. /venv/awx/bin/activate
exec env TOWER_LIB_DIRECTORY=/awx_lib /awx_devel/run.py "$@"

3
tools/docker-isolated/tower-expect
View File

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