1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

242 Commits

Author SHA1 Message Date
Matthew Jones
d469ef2385 Add in localization setup to the container image
This should fix up utf8 question marks
2017-02-02 15:51:50 -05:00
Shane McDonald
ece5299a74 Add gcc-c++ to development container 2017-01-31 13:09:59 -05:00
Ryan Petrello
73cbcc2de0 add awx.conf tests to our various test run environments 2017-01-30 12:37:17 -05:00
Matthew Jones
8a9b2fcaea Implement alternate ports for nginx
* This also allows disabling https mode in the nginx configuration
* Reconfigure the development container to not specifically require
  https, so the haproxy cluster configuration can work
2017-01-23 14:34:15 -05:00
Matthew Jones
6ed86e1934 Revert "bump pkg info tower version to 3.1.0"
This reverts commit dea4c873e8d89f3e2ed5e74f8d3eb480e57f927d.
2017-01-18 14:30:06 -05:00
Matthew Jones
9f777f6153 Add some provisions for https into haproxy and the cluster 2017-01-03 13:59:29 -05:00
Chris Meyers
12397ce610 bump pkg info tower version to 3.1.0 2016-12-20 14:42:00 -05:00
Chris Meyers
d550f6153a more jenkins removal fixes 2016-12-16 14:43:20 -05:00
Chris Meyers
304fcbe945 requirements jenkins is no longer a thing 2016-12-16 14:29:57 -05:00
Matthew Jones
a25853a3a5 Updating translation artifacts
* also installing translation tools into dev environment
* Removing fedora install instructions, no one here uses fedora
2016-12-14 15:58:47 -05:00
Wayne Witzel III
2069473534 allow API requests from localhost/127.0.0.1 to be insecure 2016-12-13 11:47:13 -05:00
Wayne Witzel III
19f7d9e8d8 redirect if no forward-slash 2016-12-12 13:25:10 -05:00
Wayne Witzel III
c6e1598b9c explicitly set long harakiri time to deal with very large inventory deletes 2016-12-12 12:44:05 -05:00
Wayne Witzel III
5f5624c5a3 Update to use Modern values for SSL 2016-12-12 12:42:53 -05:00
Wayne Witzel III
4c8af2a4b8 update uwsgi/nginx dev configuration 2016-12-12 12:42:20 -05:00
John Mitchell
d62bad536b add mkdir command to start_development script to cause collectstatic not to error 2016-12-06 12:22:18 -05:00
AlanCoding
8f3e3c4ae1 change ordering of test dirs 2016-11-14 17:50:10 -05:00
Shane McDonald
30e5904ab3 Use tower_devel as base image for unit tests 2016-11-11 15:47:17 -05:00
Shane McDonald
6f39995060 Fix docker-compose error
Fixes this error:

```
ERROR: yaml.parser.ParserError: while parsing a block mapping
  in "./tools/docker-compose/unit-tests/docker-compose.yml", line 10, column 7
expected <block end>, but found '<scalar>'
  in "./tools/docker-compose/unit-tests/docker-compose.yml", line 11, column 40
```
2016-11-10 13:38:15 -05:00
Shane McDonald
cc359ecbad Default TEST_DIRS in docker-compose 2016-11-10 13:12:29 -05:00
James Laska
90fff3da29 Add fontconfig testjs dependency
Also cleaned up some whitespace for consistency.
2016-11-08 10:18:53 -05:00
Matthew Jones
b0e40b6c29 Remove proot from dev base image in favor of bubblewrap
Remove python utils from base system, they are included with the venvs
2016-11-03 16:06:03 -04:00
Shane McDonald
793ce37a07 Get unit-test container working
node_modules was being overwritten by the bind-mount when the container started. This is kind of hacky, but it’s the only way to do this without changing everything.
2016-11-02 19:30:37 -04:00
Shane McDonald
4e81daafec Hack for downgrading npm when using overlay storage driver
https://github.com/npm/npm/issues/9863
2016-11-02 12:22:10 -04:00
Shane McDonald
021666482a Downgrade npm in unit-test image
https://github.com/npm/npm/issues/14042#issuecomment-249139529
2016-11-02 12:08:03 -04:00
Matthew Jones
defd271c90 Make sure we bootstrap the static dir prior to starting 2016-10-28 14:21:19 -04:00
Chris Meyers
7050c4e09e Revert "no one knows wtf the files in this dir a for, so don't serve them"
This reverts commit b3cccea70368ba1550366380e583751df1df061b.
2016-10-21 10:04:50 -04:00
James Laska
6c4dd57368 Copy requirements individually to avoid invalidating docker cache 2016-10-19 15:56:34 -04:00
James Laska
ac553f7368 Add image to unit-test docker-compose 2016-10-19 13:48:27 -04:00
James Laska
ff8966dd48 Update unittest container to build ui-deps 2016-10-19 12:35:59 -04:00
Chris Meyers
cbffb23d41 no one knows wtf the files in this dir a for, so don't serve them 2016-10-18 17:27:23 -04:00
Chris Meyers
87ea864466 sendfail syscall bad with crappy filesystems 2016-10-18 17:21:14 -04:00
Chris Meyers
64a15db91b fix nginx static files using 2016-10-18 15:51:01 -04:00
Wayne Witzel III
99a009b613 fix awx/ui static path 2016-10-18 15:05:05 -04:00
Wayne Witzel III
a27c708127 let nginx serve static files 2016-10-18 14:52:10 -04:00
Chris Meyers
47495b4ea6 fix mime type issues 2016-10-18 14:38:24 -04:00
Chris Meyers
ad2bee1f57 sym link nginx config by popular demand 2016-10-18 14:23:33 -04:00
Chris Meyers
4f6d966bab put nginx into honcho flow
* allows for make docker-compose-test then make honcho flow
2016-10-18 14:19:18 -04:00
Wayne Witzel III
e9be93cd70 Update tower_tools image to run nginx 2016-10-18 11:16:38 -04:00
Bill Nottingham
2ed50e05c1 Merge pull request #3714 from wenottingham/devel
Remove support@ansible.com, clean up some old links.
2016-10-17 15:15:52 -04:00
Wayne Witzel III
4220246400 use uwsgi/daphne/nginx for dev 2016-10-14 01:45:08 -04:00
Bill Nottingham
afb1fe8d69 Remove support@ansible.com, clean up some old links. 2016-10-13 16:41:34 -04:00
Matthew Jones
babe29ebfa Implement cluster health checks
* Add a local node queue to execute targeted jobs
* Add a setting for active cluster node id (per-node)
* Base the heartbeat time on the `modified` time on the Instance table
* Add periodic task that calls save() on the instance to update the
  heartbeat time if services are up
* Purge/update any ha/instance management commands
* Fix up CELERY_ROUTES settings data structure
2016-10-06 16:05:39 -04:00
Matthew Jones
959342a5fd Fixing up unit tests from HA/Clustering work
* Also purge old fact migration tests
* Upgrade some services on various container images
2016-10-03 10:40:30 -04:00
Matthew Jones
be18737802 Merge branch 'ha_installer' into devel
* ha_installer:
  Fixing up some minor nits with ha setup playbook
  Update postgres yum/apt repo locations
  Add note about when to use short/long name
  Setup playbook modifications for HA/Ramparts
2016-09-29 12:29:25 -04:00
Matthew Jones
6b0e337886 Update postgres yum/apt repo locations
*Thanks postgres team
2016-09-29 11:25:08 -04:00
James Laska
c4c1429989 Add bzip2 as a UI build dependency 2016-09-27 16:25:32 -04:00
James Laska
a4cd5a0909 Use make when installing test requirements 2016-09-21 16:34:44 -04:00
James Laska
5b6f610970 Move requirements build to unittest Dockerfile
Previously, the requirements were built during compose runtime.
2016-09-21 15:27:44 -04:00
Shane McDonald
9fe408c6f7 Add instructions to rebuild unit test container 2016-09-20 09:56:19 -04:00
James Laska
83e23b7ac4 Only run the unit tests from the docker container 2016-09-19 11:09:22 -04:00
Shane McDonald
ba8290a94a Fix pip install in unit test container
The SWIG_FEATURES environment variable is to get pip install working with M2Crypto==0.22.3. It works without SWIG_FEATURES if we update to M2Crypto >= 0.23.0.

Also did some organization, add README.
2016-09-16 11:15:30 -04:00
James Laska
c23d5f84d6 Add a Dockerfile for unittest environment
Still failing to build m2crypto due to a downlevel `swig` on el7.
2016-09-16 10:04:25 -04:00
Matthew Jones
2872409271 Integrate rabbitmqctl interface to cluster and standalone containers 2016-09-15 12:07:16 -04:00
Matthew Jones
f5d2c5c18a Merge branch 'ramparts_and_ha' into devel
* ramparts_and_ha: (21 commits)
  Rename database migrations for devel integration
  Integrate callback receiver refactoring
  Fix an issue running jobs in the cluster
  Implement a more dynamic celery queue system
  Purge old munin monitors and tools
  Refactor Tower HA Instance logic and models
  Docker compose improvements
  Initial Docker Compose workflow for Tower cluster
  Add memcached role for setup playbook
  Removing qpid from deb packaging
  Refactor rabbitmq role
  Integrate memcached into setup playbook
  Remove mongodb shutdown task
  Remove dependency on erlang_sd_notify
  Add initial rabbitmq role
  Initial rabbitmq setup playbook integration
  Update development environment for rabbit
  Replace qpid with rabbitmq
  Remove redis role from setup playbook
  Update qpid packaging, remove migrations
  ...
2016-09-15 10:19:57 -04:00
Matthew Jones
807cced571 Implement a more dynamic celery queue system
* Meant to be a starting point to more efficiently manage work routing
  and to balance work across all tower nodes
* Integrate flower as a dev tool that starts alongside other nodes.
  Helpful for observing and monitoring the queues/exchanges
* For the moment, force the task manager to only run on one node (not
  sure if this is needed)
* Define queues and routes for all task work
* Bump celery version to 3.1.23
* Expose flower through haproxy
2016-09-09 15:18:18 -04:00
Matthew Jones
eafb6c92b5 Docker compose improvements
* Make sure we explicitly set a hostname for tower nodes
* Switch rabbit vhost to use the root
2016-09-08 11:02:51 -04:00
Matthew Jones
ebf103f345 Initial Docker Compose workflow for Tower cluster
The goal is to share a common pattern with the existing development work
2016-09-08 10:18:14 -04:00
Matthew Jones
27ab6705e7 Merge branch 'ramparts_and_ha' into devel
* ramparts_and_ha:
  Removing qpid from deb packaging
  Refactor rabbitmq role
  Integrate memcached into setup playbook
  Remove mongodb shutdown task
  Remove dependency on erlang_sd_notify
  Add initial rabbitmq role
  Initial rabbitmq setup playbook integration
  Update development environment for rabbit
  Replace qpid with rabbitmq
  Remove redis role from setup playbook
  Update qpid packaging, remove migrations
  Integrate packaging for qpid/memcached
2016-09-06 09:47:11 -04:00
Matthew Jones
f0b7622672 Update development environment for rabbit 2016-08-31 14:47:20 -04:00
AlanCoding
c6c295ef32 pin Dockerfile version as well 2016-08-29 09:50:57 -04:00
Matthew Jones
b507dc53ea Putting a bow on some of the new dev workflow
* Documentation of the developer variety
* Defaulting the COMPOSE_TAG to develop, can be overridden
* Automatic docker login assuming gcr login
* Including a manual build step as an alternative to gcr
* Make qpid container shut the f**k up when it's running
2016-08-25 11:57:31 -04:00
Matthew Jones
dcb4959443 Initial qpid development work
* Switch base tower devel image from u14.04 to c7
* Switch container image to build python dependencies into itself
  instead of forcing it to be built on startup
* Upgrade venv pip to 8.1.2
* Neuter queue.py which was heavily tied to redis and was basically
  orphaned code
* Alter local_settings to override default cache settings and use
  memcached
* Alter local settings to refer to qpid instead of redis for celery
  broker
* Purge redis python dependencies and add qpid and memcached
* Update docker-compose to purge redis and add qpid and memcached
2016-08-24 16:23:47 -04:00
Leigh Johnson
ce61fe4a42 Refactor UI Build System (#3203)
* initial build trial, clean up awx/ui

* fix hardcoded refs to ng-toast, add jshint preloader

* remove browserify test

* update grunt-jshint -> jshint module loader, browser-sync, update dev targets to build-docker-machine & build-docker-cid, fix blocking tasks

* less autoprefixer

* sample build commands

* fix release build

* update README

* karma config stub

* webpack config for karma tests

* karma preview for shane

* fix build-docker-machine target

* karma+webpack test pipeline configuration, stub tests

* fix smart/job status icons classes

* fix jquery + jsyaml shims, fix LESS cascade

* fix angular-codemirror dependency, explicitly import style/mode dependencies

* shim jsonlint

* fix angular-scheduler AMD imports, remove jquuery-ui shim, fix release config

* use closed $.fn.datepicker for system-tracking

* remove packaging/node/

* remove old tests

* shrinkwrap fragile dependency sandcastle, update README, lint

* first pass at fixing rrule shim

* update makefile targets

* update gitignore w/ new flag file

* add saucelabs karma config

* add license controller test

* add examples of service and directive tests

* Makefile flubs

* consolidate clean-ui target, compulsively update flag file location

* dep on CJS/AMD/UMD compatible version of rrule lib, fix example tests/config for demo

* boilerplate karma config for saucelabs (should be abstracted to common config after proven to work)

* update docs

* docs feedback

* update Dockerfile with Node 6.x dep
2016-08-17 16:09:54 -04:00
Ryan Fitzpatrick
6bee1f11df add awx-manage executable for tower-qa tests 2016-06-16 16:45:42 -04:00
Matthew Jones
908111f656 Remove mongo key from being installed on the dev container 2016-06-08 12:34:59 -04:00
Matthew Jones
20fe9e9614 Updating docker dev workflow
* Moving to new docker compose file format
* Adding some things that will be needed for python dependencies
2016-06-08 12:25:14 -04:00
Bill Nottingham
74561e218c munin is dead. Long live munin!
Wait, not that.
2016-06-06 16:46:19 -04:00
Shane McDonald
0dc2b7426f Fix failing apt-key step in Dockerfile
The docs at https://wiki.postgresql.org/wiki/Apt are different than what we were doing. I tried this approach and it seems to be working now.
2016-05-25 16:46:45 -04:00
Matthew Jones
93b0054190 Remove the dumb-init deb that gets left behind in the container image 2016-05-03 12:01:58 -04:00
Matthew Jones
0a6df40066 Improvements to docker compose workflow with new packaging changes 2016-04-06 12:24:19 -04:00
Graham Mainwaring
a6acb5181a Merge pull request #1417 from ansible/python27_el6
EL6 Python 2.7 and Tower virtualenvs
2016-04-06 10:57:18 -04:00
Leigh Johnson
097fba690b update docker-compose build, resolves #1377 2016-04-01 10:35:07 -04:00
Graham Mainwaring
1e8e53e811 Merge branch 'devel' of github.com:ansible/ansible-tower into python27_el6
Conflicts:
	packaging/rpm/ansible-tower.spec
	tools/docker-compose/start_development.sh
2016-03-21 12:13:50 -04:00
Matthew Jones
46bbc83d0d Changes for Tower virtualenv support
* Break requirements down into ansible and tower reqs
* Generate separate Ansible and Tower virtual environments
* Install appropriate requirements files into each one
* Modify development tools to use these venvs instead of our old
  site-packages
* Modify settings to indicate venv enablement and location of venvs
* Modify tasks to use the proper virtual environment for its purpose
2016-03-21 12:11:19 -04:00
AlanCoding
a0ce6d7a25 fix regression of development package naming 2016-03-17 22:54:12 -04:00
Matthew Jones
714d13eefd Update docker development workflow to not require make develop 2016-03-02 12:09:42 -05:00
Chris Meyers
356b9c99b3 Merge branch 'mongoectomy_implementation' into devel 2016-03-01 08:22:40 -05:00
Chris Meyers
7ffe46fc74 add postgres Fact model, update views, tests
* awx.main.models Fact added
* view host fact and timeline updated to use new Postgres Fact model instead of Mongo
* Removed license set start Mongo logic
* added View tests
* added Model tests
* Removed mongo fact unit tests
* point at modified jsonbfield that supports sqlite storage driver
* postgresify fact cache receiver
* test OPTIONS endpoint
* Note: single fact view not implemented yet.
2016-02-24 14:38:54 -05:00
Chris Meyers
c2d2c57aad add newer version of proot
Use proot version that is used in production (5.1.0). Solves the ansible-playbook 2.0 symlink issue we see in our container when launching jobs.
2016-02-24 08:58:41 -05:00
Chris Meyers
62d0e8f6a5 Update Dockerfile
Add dateutils python package for `private/license_writer.py` to succeed
2016-02-24 08:52:16 -05:00
Chris Meyers
6434171977 add -y to ansible ppa adding 2016-02-16 13:51:16 -05:00
Wayne Witzel III
71a1547c3a fixing ad_hoc imports
flake8 fixes

Fix and add awx/api/tests

added fact tests

added proper xml reports for jenkins

added jenkins requirements and adjusted Makefile target
2016-02-01 18:37:56 -05:00
Wayne Witzel III
3d4580611e added pytest to requirements_dev
reworking test strucutre

reworked pytest.ini, removed functional imports, updated req_dev

remove unneeded __init__ files

add testing checker to local_settings examples

adding testing packages to system Python for docker
2016-02-01 18:37:56 -05:00
Joshua "jag" Ginsberg
16c6f93aa2 Apply to all Dockerfiles and use the preferred ENTRYPOINT form. 2016-01-25 16:58:04 -05:00
Chris Meyers
abecbb3ed1 tower api tooling
* flake8 ignore inventory plugins pulled from core
* update Dockerfile to include redis-server
2016-01-14 10:23:14 -05:00
Matthew Jones
4c632d5f59 Add swig to dependencies for compose 2015-10-05 13:21:38 -04:00
Matthew Jones
a49263ba41 Add libxmlsec1-dev to the docker compose workflow 2015-10-05 12:07:17 -04:00
Matthew Jones
5fa0ce9d58 Include apt-get update with install
This forces the Docker apt-get update to not attempt to re-use the cache
2015-09-21 14:52:43 -04:00
Matthew Jones
a2b6ffb237 Put down a file to track make develop in compose 2015-09-10 11:03:45 -04:00
Matthew Jones
f61a01b504 Switch to using ansible wait_for instead of sleep
In the startup script for docker-compose
2015-09-10 09:32:01 -04:00
Matthew Jones
7263367c6d Adding docker-compose development workflow 2015-09-09 17:16:35 -04:00