16634 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
John Mitchell	cbc20093d7	move users tokens to features folder	2018-03-16 17:15:28 -04:00
Bill Nottingham	6fc4274c68	Just set ANSIBLE_SSH_CONTROL_PATH_DIR, and don't worry about the socket file name. ... Ansible itself (since 2.3) has code to have a shorter hashed control path socket name.	2018-03-16 16:56:45 -04:00
Ryan Petrello	4f585dd09e	pin botocore to avoid dependency hell re: latest python-dateutil ... boto decided to pin python-dateutil on a version _lower than_ what we need for the TZID= bug fix: 90d7692702 (diff-b4ef698db8ca845e5845c4618278f29a)	2018-03-16 16:08:03 -04:00
John Mitchell	8babac49a6	update users token crud list to utilize string file	2018-03-16 15:56:30 -04:00
Matthew Jones	8aa7e4692d	Merge pull request #1596 from ansible/jlmitch5-patch-3 ... update .gitignore to include tower license dir	2018-03-16 12:36:00 -07:00
John Mitchell	cf20943434	update .gitignore to include tower license dir	2018-03-16 15:33:18 -04:00
Bill Nottingham	d5d2858626	Merge pull request #1591 from wenottingham/bad-date ... Bump copyright date.	2018-03-16 15:11:10 -04:00
Bill Nottingham	52599f16ad	Bump copyright date. ... We don't need to do this at the source code level, but we should do it for the app as a whole.	2018-03-16 14:57:08 -04:00
Ryan Petrello	a1f15362ab	Merge pull request #1575 from aperigault/fix_nginx_upstreams ... Fix nginx upstreams	2018-03-16 14:53:48 -04:00
Alan Rominger	1413659f5f	Merge pull request #1593 from AlanCoding/fix_processed ... Fix bug with non-event model	2018-03-16 14:53:05 -04:00
AlanCoding	bbbb7def0a	fix bug with non-event model	2018-03-16 14:27:36 -04:00
Marliana Lara	85a95c8cb8	Merge pull request #1577 from marshmalien/fix/empty_ig_list_results_error ... Fix error where list directive requires results attribute	2018-03-16 13:52:34 -04:00
adamscmRH	5f6a8ca2c0	add authorization grant to docs	2018-03-16 12:21:22 -04:00
Alan Rominger	75dd8d7d30	Merge pull request #1587 from AlanCoding/more_event_blocking ... Block deletion of resources with unprocessed events	2018-03-16 11:26:33 -04:00
AlanCoding	66108164b9	remove unnecessary mock	2018-03-16 10:55:48 -04:00
AlanCoding	69eccd3130	move ACTIVE_STATES to constants	2018-03-16 10:31:41 -04:00
AlanCoding	7881c921ac	block deletion of resources w unprocessed events	2018-03-16 10:14:28 -04:00
Wayne Witzel III	16aa3d724f	Merge pull request #1586 from wwitzel3/devel ... Moved RelatedJobMixin impl to Project instead of ProjectUpdate	2018-03-16 09:58:34 -04:00
Wayne Witzel III	6231742f71	Move RelatedJob mixin to Project	2018-03-16 09:42:32 -04:00
Wayne Witzel III	c628e9de0a	Filter active jobs by WFT/JT	2018-03-16 09:32:42 -04:00
Wayne Witzel III	c54d9a9445	Fix query using self -> self.project and fix imports	2018-03-16 09:24:46 -04:00
Wayne Witzel III	f594f62dfc	Project needs to expose all of its ProjectUpdate jobs in an active state	2018-03-16 09:12:20 -04:00
Chris Meyers	0689cea806	Merge pull request #1572 from chrismeyersfsu/fix-instance_removed_from_group ... handle unicode things in task logger	2018-03-15 16:25:13 -04:00
Chris Meyers	0cf1b4d603	Merge pull request #1535 from chrismeyersfsu/fix-protect_tower_group ... prevent tower group delete and update	2018-03-15 16:02:36 -04:00
chris meyers	1f7506e982	prevent tower group delete and update ... * related to https://github.com/ansible/ansible-tower/issues/7931 * The Tower Instance group is special. It should always exist, so prevent any delete to it. * Only allow super users to associate/disassociate instances the 'tower' instance group. * Do not allow fields of tower instance group to be changed.	2018-03-15 15:23:06 -04:00
Chris Meyers	2640ef8b1c	Merge pull request #1536 from chrismeyersfsu/fix-protect_instance_groups ... prevent instance group delete if running jobs	2018-03-15 14:57:45 -04:00
John Mitchell	e7a0bbb5db	implement users tokens sub list	2018-03-15 14:53:49 -04:00
chris meyers	5d5d8152c5	prevent instance group delete if running jobs ... * related to https://github.com/ansible/ansible-tower/issues/7936	2018-03-15 14:25:49 -04:00
Matthew Jones	3928f536d8	Merge pull request #1571 from matburt/fixing_cluster_resources ... Fixing some issues defining resource requests in openshift and k8s	2018-03-15 11:20:56 -07:00
Marliana Lara	84904420ad	Pass results attr to list directive from instance groups list	2018-03-15 14:13:33 -04:00
chris meyers	2ea0b31e2b	handle unicode things in task logger ... Related to https://github.com/ansible/ansible-tower/issues/7957 * Problem presented itself as Instances falling out of Instance Groups. This was due to the cluster membership policy decider erroring out on a logger message with unicode. * Fixed up potential other unicode logger unicode issues in tasks.py	2018-03-15 14:04:39 -04:00
Antony PERIGAULT	8cf1c1a180	Fix nginx configuration to avoid ipv6 resolutions errors	2018-03-15 17:54:51 +01:00
Matthew Jones	192dc82458	Update documentation for default pod resource requests ... Including information on how to override the default resources	2018-03-15 12:01:02 -04:00
Matthew Jones	3ba7095ba4	Fixing some issues defining resource requests in openshift and k8s ... * Allow overriding all container resource requests by setting defaults/ * Fix an issue where template vars were reversed in the deployment config * Remove `limit` usage to allow for resource ballooning if it's available * Fix type error when using templated values in the config map for resources	2018-03-15 12:00:53 -04:00
AlanCoding	43aef6c630	allow normal users to relaunch jobs w survey answers	2018-03-15 07:43:03 -04:00
Michael Abashian	597874b849	Merge pull request #1489 from mabashian/169-workflow-nodes ... Implemented new workflow node prompting	2018-03-14 16:58:35 -04:00
mabashian	9873bab451	Removed unused/commented code	2018-03-14 16:26:02 -04:00
Matthew Jones	cec77964ac	Merge pull request #1563 from matburt/container_cluster_capacity ... Implement container-cluster aware capacity determination	2018-03-14 12:06:25 -07:00
Christian Adams	2abf4ccf3b	Merge pull request #1562 from rooftopcellist/python_saml_upgrade ... add xmlsec flag to docker installs	2018-03-14 14:53:26 -04:00
Matthew Jones	b0cf4de072	Implement container-cluster aware capacity determination ... * Added two settings values for declaring absolute cpu and memory capacity that will be picked up by the capacity utility methods * installer inventory variables for controlling the amount of cpu and memory container requests/limits for the awx task containers * Added fixed values for cpu and memory container requests for other containers * configmap uses the declared inventory variables to define the capacity inputs that will be used by AWX to correspond to the same inputs for requests/limits on the deployment.	2018-03-14 14:35:45 -04:00
Shane McDonald	2af085e1fe	Merge pull request #1552 from jffz/devel ... Add ca_trust_dir to local docker installations	2018-03-14 14:32:55 -04:00
adamscmRH	8d460490c1	add xmlsec flag to docker installs	2018-03-14 14:28:35 -04:00
John Mitchell	5eed816c4d	Merge pull request #1558 from ansible/jlmitch5-patch-2 ... encode username and password when sending login POST from ui	2018-03-14 11:29:34 -04:00
John Mitchell	17cdbef376	encode username and password when sending login POST from ui ... fixes #1553	2018-03-14 11:12:50 -04:00
Alexander Bauer	709cb0ae2b	fixup! Add local_docker facility for bind-mounting ca-trust	2018-03-14 10:52:36 -04:00
Alexander Bauer	db8df5f724	Add local_docker facility for bind-mounting ca-trust ... This implements one possible solution for #411, but does not solve it for Kubernetes or Openshift installations. # Conflicts: # installer/inventory	2018-03-14 10:52:36 -04:00
Alan Rominger	5c0a52df16	Merge pull request #1533 from AlanCoding/count_events ... Track emitted events on model	2018-03-14 10:30:43 -04:00
John Mitchell	ea5ab2df7f	Merge pull request #1453 from jlmitch5/licenseInSettingsUi ... [Tower only] Make pendo license settings opt out whenever license is added	2018-03-14 10:26:08 -04:00
jeff	4fa0d2406a	Remove unneeded jinja endif	2018-03-14 15:16:26 +01:00
Alan Rominger	92b8fc7e73	Merge pull request #1554 from AlanCoding/poly_who ... fix bugs with UJT optimizations	2018-03-14 09:11:57 -04:00