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

221 Commits

Author SHA1 Message Date
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
Chris Meyers
64c91e1c1d remove stupid scripts 2016-09-16 08:52:54 -04:00
Matthew Jones
2872409271 Integrate rabbitmqctl interface to cluster and standalone containers 2016-09-15 12:07:16 -04:00
Matthew Jones
3255a17856 Exposing rabbitmq management console interface on compose 2016-09-15 10:46:45 -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
Chris Meyers
c3bb7521de Merge pull request #3474 from chrismeyersfsu/feature-workflows
workflows
2016-09-15 10:12:58 -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
13a0fd749f Purge old munin monitors and tools 2016-09-09 15:17:16 -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
Chris Meyers
2cfdee3b21 turn job templates in jobs via launch 2016-08-31 09:00:25 -04:00
Chris Meyers
4c876b40e4 initial models and endpoints added for workflows 2016-08-30 15:05:28 -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
c8e2f73d48 Support pulling the dev container image from gcr
This will be branch-relative.  If you are ont he `devel` branch then it
will pull that tag, it will try to pull the branch you are on and can be
overridden with the COMPOSE_TAG environment variable
2016-08-24 22:45:20 -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
Matthew Jones
8893f8278a Merge branch 'release_3.0.2' into devel
* release_3.0.2: (126 commits)
  Disable permissions tab in Credential > Edit form if Credential is private (#3288)
  Tweaked the popover text for job and skip tags on JT add/edit
  Workaround a cascade setnull polymorphic issue
  flake8
  Fixed old test expectations
  Made it so the credential organization field can't be changed
  Skip some unit tests
  Fixed org auditor visibility of team credentials
  Fix sosreport
  fix credential kind options for list
  interpret any code below 300 as success
  bail when status code is over 300
  Make CloudForms inventory_script work
  Use no_log when handling passwords
  Prevent ignored task from being displayed as failing.
  making ec2 cred optional on group->edit
  making ec2 credential optional for ec2 inventory
  Revert "Fix to ensure org auditors can see team credentials"
  Fixed team credential list to work with corrected permissions
  Making the username and password fields optional
  ...
2016-08-18 22:52:55 -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
AlanCoding
ba101573d6 interpret any code below 300 as success 2016-08-12 11:25:16 -04:00
AlanCoding
efb66cad20 bail when status code is over 300 2016-08-12 07:31:01 -04:00
Alan Rominger
c1e340fbd6 allow for 201 status_code from callback 2016-08-09 14:56:19 -04:00
Wayne Witzel III
a0c563e831 flake8 fixups 2016-07-26 14:50:48 -04:00
Matthew Jones
d6679936da Update license info, add tool for helpsies 2016-07-12 16:30:30 -04:00
Wayne Witzel III
f0418d8841 Merge pull request #2634 from wwitzel3/issue-2560
Disallow non-admin of a user to add a user to Roles
2016-06-27 11:28:38 -04:00
Wayne Witzel III
87ffded774 renaming Credential.owner_role -> Credential.admin_role 2016-06-24 16:55:07 -04:00
Bill Nottingham
139dae4b21 Remove old license auditor thing.
We don't use this any more.
2016-06-23 15:39:23 -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
Chris Meyers
f9d0c74bbc fix supervisord issue
* exec spawned python process so we don't have grandparents
* increase time until supervisord is killed
2016-05-13 15:41:46 -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
Akita Noek
569f61ed30 Fixed swapped transaction/rebuild statements 2016-04-22 10:17:21 -04:00
Akita Noek
41553c39bf Moved dummy data generator out to tools directory 2016-04-18 16:56:29 -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
25f6200dd5 remove old docker build instructions 2016-04-01 10:50:51 -04:00
Leigh Johnson
097fba690b update docker-compose build, resolves #1377 2016-04-01 10:35:07 -04:00
James Laska
e1ee5d396d Don't manage mongo in ansible-tower-service script
Connect #1290
2016-03-30 09:10:17 -04:00
Graham Mainwaring
cd698f0ea1 Removed Munin config for Mongo 2016-03-28 14:43:27 -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
Graham Mainwaring
1427fee442 Add script wrapper to establish Tower SCL and venv before running Python 2016-03-21 12:11:19 -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
Matthew Jones
16a0d8b45d Merge pull request #710 from ansible/jag/dumb-init
Use dumb-init to manage processes in docker containers
2016-01-29 10:15:00 -05:00
Joshua "jag" Ginsberg
f25b76aee9 Integrate statsd metrics into ansible playbook execution.
* Add dependencies for pystatsd and django-statsd-mozilla
* Default turned off except for development environment
* Modify docker-compose to install statsd/graphite host
2016-01-26 16:54:24 -05:00
Joshua "jag" Ginsberg
16c6f93aa2 Apply to all Dockerfiles and use the preferred ENTRYPOINT form. 2016-01-25 16:58:04 -05:00
Joshua "jag" Ginsberg
df072c1a6f Initial attempt at dumb-init 2016-01-25 16:01:53 -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
James Laska
9bed8376ba Update AMI copy playbook 2015-11-20 14:05:22 -05:00
Chris Meyers
0b4efa3fcd added git pre commit hook to run flake8 2015-11-06 07:38:29 -05:00
Bill Nottingham
1bd6ffa3c9 Add PowerShell version of request_tower_configuration. From @nitzmahone. 2015-11-05 10:15:37 -05:00
Matthew Jones
99da0965ef Add a docker-ui container to the compose workflow 2015-10-19 12:07:09 -04:00
Matthew Jones
950a299c87 Add swig to dependencies for compose 2015-10-09 11:58:47 -04:00
Matthew Jones
f85fb0551d Add libxmlsec1-dev to the docker compose workflow 2015-10-09 11:58:47 -04:00
James Laska
6da39aeac2 Fix AMI publish playbook 2015-10-06 16:20:03 -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
519b0e8eef Merge branch 'release_2.3' into devel
* release_2.3: (54 commits)
  Upgrade changelog for 2.3
  Purge superlance
  Purge an old supervisor config
  Require chris-lea libzmq3
  Use the htpasswd command, not the module
  Fix a playbook syntax error for postgres
  Ensure postgres is started earlier in setup role
  Allow customizing npm path
  Include RPM-GPG-KEY-ansible-release for all releases
  Simplify GPG keys
  Correct broken RPM-GPG-KEY
  Use gpg --passphrase for signing CHECKSUM
  Handle rpm --addsign pasphrase prompts
  Adding docker-compose development workflow
  Fix license in spec file.
  Updates to selinux policy for some munin plugins
  ansible 1.8.4 requires sudo:true when using sudo_user
  Fix expect script timeout
  Disable timeout and correct sign.exp error
  Fix expect script hang
  ...
2015-09-11 16:03:52 -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
James Laska
9d5d17fa70 Handle rpm --addsign pasphrase prompts 2015-09-09 18:51:41 -04:00
Matthew Jones
940910b9a3 Adding docker-compose development workflow 2015-09-09 17:17:48 -04:00
Matthew Jones
7263367c6d Adding docker-compose development workflow 2015-09-09 17:16:35 -04:00
James Laska
87d8808c2d Fix expect script timeout 2015-09-09 13:07:09 -04:00
James Laska
b7ddbc48b1 Disable timeout and correct sign.exp error 2015-09-09 12:13:55 -04:00
James Laska
06e6980eaf Fix expect script hang 2015-09-09 11:18:06 -04:00
James Laska
3a914619ce Improvements to the package signing script 2015-09-09 11:01:44 -04:00
James Laska
1b6b622d70 Ignore case to handle multiple prompts
Handles the multiple prompts from debuild and reprepro, each with different
cases.
2015-09-08 22:00:27 -04:00
James Laska
c02d993e73 Return exit code from spawned process 2015-09-08 15:43:04 -04:00
James Laska
3210b8c0dc Add helper script to sign using expect 2015-09-07 20:37:20 -04:00
Matthew Jones
5727d722b6 Merge remote-tracking branch 'upstream/release_2.3' into devel
* upstream/release_2.3: (91 commits)
  Include python-{paramiko,ecdsa} dependencies
  Remove extra epel testing stanzas
  Unit test for ec2 credentialless inventory
  Fix issue with ec2 iam sync with no credential.
  Use the htpasswd command instead the ansible module
  Pip is no longer needed
  check local user root or not in ./configure
  Remove unneeded when check for super user addition
  Improve distro detection in setup.sh
  Fix superuser check on upgrade
  Minor improvements to setup.sh
  Remove ansible prerequisite check from configure
  Attempt to install ansible within setup.sh
  Allow munin processes to access postgres
  Move up base package dependency install
  fixes jenkins failures
  Proper flake8 fix
  fixes executing processes with correct PYTHONPATH will pickup .pth files
  Show the repo for bundled package file dump
  Proper flake8 fix
  ...
2015-09-03 15:46:10 -04:00
Bill Nottingham
cb2a0a0f69 clean up dups 2015-09-01 09:56:06 -04:00
Matthew Jones
bd3faea671 Fix path check in start_development docker script 2015-08-31 15:15:49 -04:00
Bill Nottingham
ba2a2d17d7 Update license audit toolset and license list for new requirements.txt. 2015-08-28 15:48:54 -04:00
Tim Gerla
13ca614a14 Fix up sosreport to remove some sensitive information and add some useful things
- don't include SECRET_KEY
- don't include SSL certs
- add /etc/ansible
- fix the pip freeze command
- add a dir listing of /var/lib/awx/job_status (but not the actual stdouts)
2015-08-25 15:04:19 -04:00
Chris Meyers
99fb641b1b all vendor dependencies expressed in requirements.txt 2015-08-17 11:17:53 -04:00
James Laska
31bf1a97d1 Fail if required arguments are missing 2015-08-14 08:13:47 -04:00
Matthew Jones
43d873acab Fix path check in start_development docker script 2015-08-10 14:36:39 -04:00
Matthew Jones
a992881b17 Install honcho in the docker development container 2015-08-10 11:00:27 -04:00
Matthew Jones
5969c6a380 Check for site-packages and if it doesn't exist symlink to the built directory 2015-08-10 10:24:29 -04:00