External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-15 08:20:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
4,112 Commits 63 Branches 102 Tags
612147e3557504c7c0ad026c51d405fe9fadbf08
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Sneeringer 086b164655 Select the user along with the auth token. 2015-03-23 14:06:36 -05:00
Luke Sneeringer 9138b7c8ae Merge pull request #76 from ansible/licenses-unstable 
Licenses
 2015-03-03 09:29:07 -05:00
Luke Sneeringer 4f9c684c67 Merge branch 'master' into licenses-unstable 2015-02-25 12:37:44 -06:00
Luke Sneeringer 995ae426b8 Revert "Revert "Show feature flags and license type in /api/v1/config/"" 
This reverts commit 4a92181a7dd20789f5b5072884b0667dbf653e3a.
 2015-02-18 13:31:17 -06:00
Luke Sneeringer 14d094ccf7 Revert "Revert "Added feature flags and license types to licenses."" 
This reverts commit 5692bbf280f9cf64e5a7c90174595d532510c334.
 2015-02-18 13:29:46 -06:00
Luke Sneeringer bf8b593f36 Revert "Added feature flags and license types to licenses." 
This reverts commit 3b459d2445ccfc5ad9c29f835a611ef1d817a7ec.
 2015-02-18 13:27:11 -06:00
Luke Sneeringer 6abb08f4f1 Revert "Show feature flags and license type in /api/v1/config/" 
This reverts commit 40552da5ad19bab3103e6438821383953f48149e.
 2015-02-18 13:26:56 -06:00
Luke Sneeringer 4b107c2b5e Merge branch 'master' into licenses-unstable 2015-02-18 13:21:45 -06:00
Luke Sneeringer e9ee27a709 Show feature flags and license type in /api/v1/config/ 2015-02-18 12:58:18 -06:00
Luke Sneeringer 395571e1ae Added feature flags and license types to licenses. 2015-02-18 12:58:18 -06:00
Luke Sneeringer 28a39839c2 Show feature flags and license type in /api/v1/config/ 2015-02-18 12:53:51 -06:00
Luke Sneeringer c5869db5c4 Added feature flags and license types to licenses. 2015-02-16 15:09:58 -06:00
Luke Sneeringer 67bf4c9cf8 Address IOError 500 2015-02-03 11:32:59 -06:00
Luke Sneeringer 00a38fd75f Update projects when a new primary is set. 2015-01-30 11:21:05 -06:00
Luke Sneeringer fea31271d2 Move cert and key files to tower.cert and tower.key. 2015-01-26 16:11:56 -06:00
Luke Sneeringer 86a47bb11c Ensure extra_vars is initiated. 2015-01-05 16:51:11 -06:00
Luke Sneeringer 27e8d13790 Do not run task system on secondaries. 2014-12-18 12:14:49 -06:00
Luke Sneeringer fd6eb66b20 Secondaries should not have schedules. 2014-12-17 15:33:16 -06:00
Luke Sneeringer c02647cf04 Always allow the /ping/ endpoint, even on secondaries. 
Also, if content is None, it does not have the keys we are checking for
in the ./configure script.
 2014-12-17 13:09:58 -06:00
Luke Sneeringer efee35bf70 Fix redirect. 2014-12-17 12:29:58 -06:00
Luke Sneeringer 719ae63a28 Fix error causing single-host HA environments to report not HA. 2014-12-17 12:22:53 -06:00
Luke Sneeringer 4e5ebac6a0 Nicer error on bad arguments to user_info. 2014-12-12 13:43:23 -06:00
Luke Sneeringer 0357bd074e Change user_exists to user_info. 2014-12-11 12:04:13 -06:00
Luke Sneeringer a8390070c1 Explicitly typecast self.pk. 2014-12-09 13:29:55 -06:00
Luke Sneeringer 9de1dc31f9 Identify the master by hostname. 2014-12-09 09:50:18 -06:00
Luke Sneeringer d93870d828 Ability to remove instances. 2014-12-05 14:19:54 -06:00
Luke Sneeringer 6f09bb16ba Do not require an admin password on upgrade. 
This commit makes us only require an admin password if there is a new
admin user.
 2014-12-03 13:11:30 -06:00
Luke Sneeringer 9dfa26fa58 Do not use ip_address on instances anymore. 2014-12-02 13:17:38 -06:00
Luke Sneeringer f890b6daa7 Shift makefile to hostname. 2014-12-02 11:20:03 -06:00
Luke Sneeringer c3b962ced5 /api/v1/ping/ was added in 2.1.0 2014-12-02 10:39:54 -06:00
Luke Sneeringer d6699353e5 Save hostnames, not IP addresses, for HA. 2014-12-02 10:34:25 -06:00
Luke Sneeringer 2b33715b66 Make CALLBACK_CONSUMER_PORT falsy values be dummified. 2014-11-25 12:02:19 -06:00
Luke Sneeringer 27933df220 Fix ZeroMQ port mismatch. 2014-11-25 10:39:42 -06:00
Luke Sneeringer f8cbdd65a5 Merge branch 'master' into reintroduce-zeromq-unstable 2014-11-25 09:01:59 -06:00
Luke Sneeringer f49fe9ff56 Make it faster. 2014-11-24 14:41:13 -06:00
Luke Sneeringer 1efff8267d ZeroMQ changes. 2014-11-21 16:21:15 -06:00
Luke Sneeringer 35824f8d67 Put files in the right place! 2014-11-21 12:51:17 -06:00
Luke Sneeringer 4a6b16bab9 Error message correction. 2014-11-21 09:32:42 -06:00
Luke Sneeringer 8446a9ac54 Put socket.py in the wrong folder. 2014-11-21 09:28:25 -06:00
Luke Sneeringer 52aca5a081 Theoretically working Socket implementation. 2014-11-21 09:24:49 -06:00
Luke Sneeringer 99b8b8e193 Beginning work on reintroducing ZeroMQ. 2014-11-21 08:43:54 -06:00
Luke Sneeringer ee0e549978 Silly variable inconsistency. 2014-11-20 14:04:33 -06:00
Luke Sneeringer 8b1f3c33a5 Allow more falsy values. 2014-11-20 11:13:26 -06:00
Luke Sneeringer 46ef0475d4 Allow string "false" to mean False on is_superuser 2014-11-20 10:53:15 -06:00
Luke Sneeringer d72d95b282 Add ping to the front page view. 2014-11-18 11:08:59 -06:00
Luke Sneeringer 3d51b25762 Unit tests now start their own Redis. 2014-11-14 11:57:34 -06:00
Luke Sneeringer a8002d165a Merge branch 'configure' 2014-11-13 14:50:28 -06:00
Luke Sneeringer 3279f59986 Newline 2014-11-13 14:50:10 -06:00
Luke Sneeringer cb77e319d2 Newline 2014-11-12 12:58:45 -06:00
Luke Sneeringer 8d2a011ca8 Don't commit things with NameError! 2014-11-12 12:17:38 -06:00
Luke Sneeringer 9cec5d0144 Set SYSTEM_UUID in tests. 2014-11-12 12:13:29 -06:00
Luke Sneeringer 9085bf5b0f Fix task_system bug. 2014-11-12 10:43:08 -06:00
Luke Sneeringer 2f87ad8643 rabbit_alive -> redis_alive 2014-11-12 07:37:04 -06:00
Luke Sneeringer d1c7ded068 Update munin to Redis 2014-11-11 14:21:13 -06:00
Luke Sneeringer 1edd8f9c0a Updates to Makefile and CONTRIBUTING 
...for the RabbitMQ to Redis changeout.
 2014-11-11 14:18:39 -06:00
Luke Sneeringer 3a8c32444b Merge branch 'master' into expunge-zeromq-unstable 
Conflicts:
	awx/main/management/commands/run_callback_receiver.py
	awx/main/management/commands/run_task_system.py
 2014-11-11 12:00:25 -06:00
Luke Sneeringer 29eaa495bc Do not allow superuser promotion by non-superusers. 2014-11-11 11:55:03 -06:00
Luke Sneeringer 122bf9fcd3 Merge branch 'master' into expunge-zeromq-unstable 2014-11-11 07:52:11 -06:00
Luke Sneeringer 93d7095383 Merge branch 'master' into expunge-zeromq-unstable 2014-11-10 10:35:20 -06:00
Luke Sneeringer 0e8121f7f1 Merge branch 'master' into expunge-zeromq-unstable 
Conflicts:
	setup/roles/awx_install/handlers/main.yml
 2014-11-10 08:47:08 -06:00
Luke Sneeringer 71946d3802 Superuser fix redux. 2014-11-10 08:43:24 -06:00
Luke Sneeringer 2925498c4e More complete superuser fix. 2014-11-07 16:23:42 -06:00
Luke Sneeringer ed34d5f469 Fix all but one unit test. 2014-11-07 14:26:31 -06:00
Luke Sneeringer ec55603e3f Fixing various small issues to improve tests. 2014-11-05 16:07:57 -06:00
Luke Sneeringer 2e19b65738 Fix for run_task_system 2014-11-04 13:51:08 -06:00
Luke Sneeringer 8346f68f2c Make pubsub.subscribe work. 2014-11-04 11:16:53 -06:00
Luke Sneeringer fd9647ce94 Use closing consistently. 2014-11-04 10:46:17 -06:00
Luke Sneeringer 8d99ef116c Callback Receiver Fixes. 2014-11-04 10:39:53 -06:00
Luke Sneeringer c3920ebf4b Fixing the Redis vendor. 2014-11-03 15:13:06 -06:00
Luke Sneeringer f69969f1e0 Add vendored Redis. 2014-11-03 14:50:01 -06:00
Luke Sneeringer e2b9509ef1 Merge branch 'master' into expunge-zeromq-unstable 2014-11-03 10:38:06 -06:00
Luke Sneeringer 5e4e61dcda Merge branch 'master' into expunge-zeromq-unstable 
Conflicts:
	setup/roles/awx_install/tasks/main.yml
 2014-10-31 15:10:10 -05:00
Luke Sneeringer 89f34f6a2e Merge branch 'master' of github.com:ansible/ansible-tower 
Conflicts:
	awx/ui/static/js/helpers/Variables.js
 2014-10-31 14:29:32 -05:00
Luke Sneeringer 88a0a0449f Minor indentation change to make JSlint not complain. 2014-10-31 13:36:15 -05:00
Luke Sneeringer 01a611b6b9 Moving postgres conf to its own file in conf.d 2014-10-31 13:23:50 -05:00
Luke Sneeringer f000e71371 Merge branch 'master' into expunge-zeromq-unstable 2014-10-30 15:30:39 -05:00
Luke Sneeringer e892a45aa2 Shift to local inventory file. 2014-10-30 14:28:37 -05:00
Luke Sneeringer 8d90650134 Shifting job callbacks to ZeroMQ. 2014-10-29 13:51:47 -05:00
Luke Sneeringer 99381f11fa Beginning swap of ZeroMQ for Redis. 2014-10-27 16:18:04 -05:00
Luke Sneeringer 842086eef7 Readability cleanup. 2014-10-27 14:03:39 -05:00
Luke Sneeringer f4efbfc95a Working Redis, but need to switch out ZeroMQ. 2014-10-27 13:24:24 -05:00
Luke Sneeringer 4eb1eb8036 Remove RabbitMQ. 2014-10-27 11:43:37 -05:00
Luke Sneeringer 29afec8f26 Merge branch 'master' into expunge-zeromq-unstable 2014-10-27 10:39:10 -05:00
Luke Sneeringer b8c6c8b83a Merge branch 'master' into expunge-zeromq-unstable 2014-10-23 11:45:12 -05:00
Luke Sneeringer 446f29927d Proof of concept Redis PubSub. 2014-10-23 08:50:46 -05:00
Luke Sneeringer 0d5dbd189e Proof of concept Redis FIFO 2014-10-23 08:50:46 -05:00
Luke Sneeringer c3cc163702 Presence of Redis on all platforms. 2014-10-23 08:50:45 -05:00
Luke Sneeringer b7b92cb995 Only allow superusers to create other superusers. 2014-10-22 16:11:07 -05:00
Luke Sneeringer ad97ebb09b Fix Makefile 2014-10-22 10:37:42 -05:00
Luke Sneeringer 47cdb6fc57 register_instance in make develop 2014-10-20 14:46:47 -05:00
Luke Sneeringer 46477a0c05 Add SYSTEM_UUID to local_settings.example 2014-10-20 12:21:29 -05:00
Luke Sneeringer cbc7f6ec36 Merge branch 'ha-unstable' 2014-10-20 10:54:39 -05:00
Luke Sneeringer fa82ed56e2 Adding Instance/JobOrigin migration 2014-10-20 10:43:08 -05:00
Luke Sneeringer 4045a1e4fa Migration, again! :) 2014-10-20 08:46:39 -05:00
Luke Sneeringer 841d5ab085 Merging migrations sucks. 2014-10-20 08:05:30 -05:00
Luke Sneeringer 1bdd1f4c34 Remove migration...again. 2014-10-20 08:05:30 -05:00
Luke Sneeringer 53234eb1ab Return stub records in testing. 2014-10-20 08:05:29 -05:00
Luke Sneeringer b18303be20 Readd migration for instances and job origins. 2014-10-20 08:05:29 -05:00
Luke Sneeringer 08570ef4e9 Add primary and secondary IP output to ping view. 2014-10-20 08:04:18 -05:00
Luke Sneeringer 2166a3788c Adding HA status to ping view. 2014-10-20 08:04:17 -05:00