External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Update "make server" endpoint and Makefile to include the new fact cache

Browse Source 
receiver. Upgrade docker tool to install mongo and pymongo
This commit is contained in:
Matthew Jones
2015-04-23 13:34:56 -04:00
parent 405be7edd8
commit c45a422590
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -199,10 +199,12 @@ server_noattach:
tmux rename-window 'Tower' tmux rename-window 'Tower'
tmux select-window -t tower:0 tmux select-window -t tower:0
tmux split-window -v 'exec make celeryd' tmux split-window -v 'exec make celeryd'
tmux split-window -h 'exec make socketservice'
tmux select-pane -U
tmux split-window -v 'exec make receiver'
tmux split-window -h 'exec make taskmanager' tmux split-window -h 'exec make taskmanager'
tmux new-window 'exec make receiver'
tmux select-window -t tower:1
tmux rename-window 'Extra Services'
tmux split-window -v 'exec make socketservice'
tmux split-window -h 'exec make factcacher'
server: server_noattach server: server_noattach
tmux -2 attach-session -t tower tmux -2 attach-session -t tower
@@ -229,6 +231,9 @@ taskmanager:
socketservice: socketservice:
$(PYTHON) manage.py run_socketio_service $(PYTHON) manage.py run_socketio_service
factcacher:
$(PYTHON) manage.py run_fact_cache_receiver
pep8: pep8:
pep8 -r awx/ pep8 -r awx/

4
tools/docker/Dockerfile
View File

@@ -8,9 +8,9 @@ RUN apt-get update
RUN apt-get install -y software-properties-common python-software-properties RUN apt-get install -y software-properties-common python-software-properties
RUN add-apt-repository -y ppa:chris-lea/redis-server; add-apt-repository -y ppa:chris-lea/zeromq; add-apt-repository -y ppa:chris-lea/node.js RUN add-apt-repository -y ppa:chris-lea/redis-server; add-apt-repository -y ppa:chris-lea/zeromq; add-apt-repository -y ppa:chris-lea/node.js
RUN apt-get update RUN apt-get update
RUN apt-get install -y tmux git mercurial subversion python-dev python-pip libyaml-dev python-yaml python-paramiko python-jinja2 make postgresql python-psycopg2 python-ldap nodejs redis-server python-gevent libzmq3 python-zmq python-netifaces && rm -rf /var/lib/apt/lists/* RUN apt-get install -y tmux git mercurial subversion python-dev python-pip libyaml-dev python-yaml python-paramiko python-jinja2 make postgresql python-psycopg2 python-ldap nodejs redis-server python-gevent libzmq3 python-zmq python-netifaces mongodb && rm -rf /var/lib/apt/lists/*
RUN git clone http://d7f73f8614295715a4777bf15f46d0d486ad0e21:x-oauth-basic@github.com/ansible/ansible-commander.git tower RUN git clone http://d7f73f8614295715a4777bf15f46d0d486ad0e21:x-oauth-basic@github.com/ansible/ansible-commander.git tower
RUN pip install Django==1.6.7 django-devserver django-debug-toolbar django-jenkins ipython ansible RUN pip install Django==1.6.7 django-devserver django-debug-toolbar django-jenkins ipython ansible pymongo
RUN cd /tower ; make develop RUN cd /tower ; make develop
RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_user -U postgres -a "name=awx-dev password=AWXsome1 login_user=postgres" all' RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_user -U postgres -a "name=awx-dev password=AWXsome1 login_user=postgres" all'
RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_db -U postgres -a "name=awx-dev owner=awx-dev login_user=postgres" all' RUN /etc/init.d/postgresql start ; su - postgres -c 'ansible -i "127.0.0.1," -c local -v -m postgresql_db -U postgres -a "name=awx-dev owner=awx-dev login_user=postgres" all'