Chris Meyers
df6b6e55a7
add tests that trigger error without fix provided
2015-04-28 08:28:36 -04:00
Chris Meyers
c44019c4df
Merge branch 'master' into fix-credential_id
...
Conflicts:
awx/api/views.py
2015-04-27 14:57:53 -04:00
Chris Meyers
086ae8f9ad
allow credential_id to job template launch. Funnel credential_id into credential.
2015-04-27 13:31:57 -04:00
Chris Meyers
ee66e98af5
Merge pull request #160 from chrismeyersfsu/feature-cleanup_facts_all_time2
...
support --granularity=0d to delete all facts.
2015-04-27 13:20:17 -04:00
Chris Church
d1ea8708ad
Make sure credential can only be assigned to a user OR team, but never both. Fixes https://trello.com/c/yzlAEfAN
2015-04-27 12:43:02 -04:00
Chris Meyers
f1afae4b80
support --granularity=0d to delete all facts.
...
Still respect --older_than
2015-04-27 11:12:50 -04:00
Matthew Jones
a081614c9a
Merge branch 'mongo_ancillary_services' into upstream_master
...
* mongo_ancillary_services:
Adding the fact cache receiver to the supervisor config
Implementing tower cleanup task for cleaning up facts
2015-04-27 09:49:35 -04:00
Chris Meyers
f7355ae5f3
Merge pull request #158 from chrismeyersfsu/fix-credential_file
...
return empty private data content rather than None for generate private ...
2015-04-27 08:40:10 -04:00
Chris Meyers
b323e26b2f
do not generate scm private key file if no ssh data associated with credential
2015-04-26 20:03:48 -04:00
Chris Church
0d4c1a4245
Add tests for job template launch with invalid/inactive credential, fix bug that allowed an inactive credential to be passed if the job template already had an active credential.
2015-04-26 12:28:39 -04:00
Chris Meyers
612147e355
return empty private data content rather than None for generate private file method
2015-04-26 10:58:15 -04:00
Matthew Jones
22acd51650
Implementing tower cleanup task for cleaning up facts
2015-04-24 14:15:25 -04:00
Chris Meyers
ce953d1ad2
changed inventory sync private data file key to more appropriate cloud_credential from scm_credential. Wrapped openstack credentials in dict
2015-04-23 16:44:30 -04:00
Matthew Jones
3f4aafa501
Merge remote-tracking branch 'refs/remotes/chrismeyers/fix-cloud_credentials2' into upstream_master
...
* refs/remotes/chrismeyers/fix-cloud_credentials2:
multiple credentials implementation style more inline with existing code
allow machine and cloud credentials to co-exist.
2015-04-23 16:09:14 -04:00
Chris Meyers
360aae8c25
multiple credentials implementation style more inline with existing code
2015-04-23 13:34:02 -04:00
Matthew Jones
405be7edd8
Merge branch 'openstack_inventory_support' into upstream_master
...
* openstack_inventory_support:
Use inventory_source source_vars to control what address we use for ansible_ssh_host
Some small changes to tower openstack work
2015-04-23 11:09:41 -04:00
Matthew Jones
abdfb26b3d
Use inventory_source source_vars to control what address we use for ansible_ssh_host
2015-04-23 11:07:31 -04:00
Chris Meyers
b63a577b33
allow machine and cloud credentials to co-exist.
2015-04-23 10:11:21 -04:00
Chris Meyers
13aa8fce82
Merge pull request #147 from chrismeyersfsu/fix-azuer
...
handle shutdown azure instances
2015-04-23 10:06:26 -04:00
Matthew Jones
5a401c31aa
Handle any exception that could come from sending a packet to a client
2015-04-22 16:50:37 -04:00
Matthew Jones
36512d74c2
Unused variable to make pyflakes happy
2015-04-21 16:13:37 -04:00
Matthew Jones
0fc753046d
This fixes an issue where various parts of the system could get stuck
...
waiting to emit a socketio event if there was a problem with the
websocket service. Instead of crashing and hanging the system it will
now emit an error and continue.
2015-04-21 15:29:37 -04:00
Matthew Jones
fb3bbea027
Add recv_disconnect to acl allowed methods
2015-04-21 14:13:53 -04:00
Chris Meyers
1df51f3c48
better error handling
2015-04-20 17:15:03 -04:00
Matthew Jones
f45d75c06c
Some small changes to tower openstack work
...
1) Favor private addresses in the openstack inventory sync
2) Force refresh
3) use hostId and promote it to the top level vars object so we can
track individual host changes
2015-04-20 15:11:06 -04:00
Chris Church
7be54d585b
Fix RBAC query bug in checking if user can run ad hoc commands. Fixes https://trello.com/c/fl36Hvh3
2015-04-16 15:27:16 -04:00
Chris Church
6dda8e58ad
Don't return ids for deleted credential/inventory for ad hoc commands. Fixes https://trello.com/c/ps2bW38Q
2015-04-16 14:31:23 -04:00
Chris Church
3f98b40ed7
Add test for cleaning up activity stream, delete objects in batches to make it quicker.
2015-04-16 13:40:36 -04:00
Chris Church
76132dbab2
Update license check when adding hosts. Fixes https://trello.com/c/Llol9BCJ
2015-04-16 12:28:13 -04:00
Chris Church
883f912969
Allow verbosity level choices to be specified by settings.
2015-04-15 13:09:03 -04:00
Chris Meyers
e6f376ebc2
Merge pull request #141 from chrismeyersfsu/refactor-jobs_tests2
...
split out job test a little bit more
2015-04-14 13:01:36 -04:00
Matthew Jones
6c5fd93ce5
Merge pull request #137 from matburt/openstack_inventory_support
...
Openstack inventory support
2015-04-14 12:43:20 -04:00
Chris Meyers
f2445beb75
flake8
2015-04-14 12:00:05 -04:00
Chris Meyers
af25a362da
jerkins wants base imported .. what jerkins wants .. jerkins gets
2015-04-14 10:22:39 -04:00
Chris Meyers
64d4304a97
flake8
2015-04-14 10:16:23 -04:00
Chris Meyers
4a4b14ba98
split out job test a little bit more
2015-04-14 09:06:20 -04:00
Chris Meyers
a930c4d8b2
detect invalid license thrown by inventory update
2015-04-14 08:36:55 -04:00
Chris Meyers
bbe23b0071
Merge pull request #133 from chrismeyersfsu/feature-cleanup_facts
...
implemented cleanup_facts command + tests
2015-04-13 15:10:10 -04:00
Matthew Jones
6525120c15
model and task support for launching openstack inventory updates
2015-04-13 15:05:58 -04:00
Chris Meyers
7ecddcfa70
flake8
2015-04-13 11:53:27 -04:00
Chris Meyers
44e5db39ab
implemented cleanup_facts command + tests
2015-04-13 10:45:47 -04:00
Chris Church
fd09cc3726
Return survey_enabled as False for launch endpoint when no survey spec is defined for a job template; allow job template to be launched anyways. Fixes https://trello.com/c/zErQqf1L
2015-04-10 16:20:57 -04:00
Chris Church
3b66dbed03
Fix those flaking warnings.
2015-04-10 15:16:06 -04:00
Chris Church
090456a247
Add grace_period_remaining to allow adding hosts with AWS licenses. Fixes https://trello.com/c/bw6JbrhW
2015-04-10 14:19:33 -04:00
Chris Church
48bbac7f18
Fix flake8 warnings.
2015-04-09 22:55:53 -04:00
Chris Church
aa0c16d726
Add choices for job and ad hoc command verbosity.
2015-04-09 18:55:42 -04:00
Chris Church
8beed7f409
Disable ControlPersist for ad hoc commands, should avoid any issues with proot or needing to clean up sockets afterwards.
2015-04-09 10:32:24 -04:00
Chris Church
9500e9b63e
Change credential to return 'ssh_password' instead of 'password' when value is set to 'ASK'.
2015-04-08 15:32:45 -04:00
Chris Meyers
2a039bb31f
moved new fact implementation to fact app
2015-04-07 09:50:35 -04:00
Chris Meyers
85c753afea
added host timeline query
2015-04-07 09:50:35 -04:00
