25540 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ryan Petrello	814f033d46	monkey-patch another Django names_digest for FIPS support	2020-05-08 14:12:50 -04:00
Christian Adams	c494c38966	Merge pull request #4294 from ansible/i18n_release_3.7.0_translations ... [WIP] UI translation strings for release_3.7.0 branch	2020-05-08 09:56:40 -04:00
Bill Nottingham	64add6e907	Merge pull request #4305 from wenottingham/why-fix-a-parser-when-you-can-delete-it ... Remove ssh version checking.	2020-05-07 17:07:56 -04:00
Bill Nottingham	4c6cac90fd	Remove ssh version checking. ... 6.6 was added in RHEL 7.1, which is well before our supported platforms.	2020-05-07 15:30:55 -04:00
Christian Adams	bae9c03258	Merge pull request #4302 from rooftopcellist/rsyslog_conf_race ... Prevent Rsyslog config race condition when writing to file	2020-05-07 14:21:57 -04:00
Christian Adams	37125102ab	Clean up rsyslog config temp dir ... - dir is cleaned up at end of 'with' context	2020-05-07 12:48:50 -04:00
Christian Adams	0675b9e8fa	Make rsyslog.conf writes atomic ... - This writes the rsyslog.conf in a temporary dir, then replaces the original in one atomic operation.	2020-05-06 17:54:51 -04:00
Jim Ladd	e64f9c6963	Merge pull request #4298 from jladdjr/add_foreman_options ... pass along all foreman options to plugin, add support for group_patterns	2020-05-06 11:28:02 -07:00
Christian Adams	d0a7f7f4e9	Merge pull request #4297 from rooftopcellist/rsyslog_term ... Rsyslog config race condition between saving and writing the file	2020-05-06 13:41:13 -04:00
AlanCoding	e24c511aef	Update test files for sat6 updates	2020-05-06 11:49:04 -04:00
Jim Ladd	84c854bdf3	add support for keyed_groups	2020-05-06 00:29:55 -07:00
Jim Ladd	e243513a0d	pass along all foreman options to plugin	2020-05-05 19:36:55 -07:00
Alan Rominger	961c5589c1	Refresh inventory collection requirements (#4296) ... * Refresh inventory collection requirements Fix bug specific to Docker development where the right folder of install was not specified in the setting Add initial rhv/ovirt version for consistency * Update unit test to ovirt name change	2020-05-05 18:22:00 -04:00
Alan Rominger	1ca29df0de	Fix for schedule delete 500 from Gabe (#4290)	2020-05-05 18:11:51 -04:00
Christian Adams	e41d33991a	Prevent a race condition when writing the rsyslog.conf	2020-05-05 15:55:08 -04:00
Christian Adams	c565130b35	TERM rsyslogd instead of KILL for more graceful shutdown	2020-05-05 15:38:57 -04:00
Ryan Petrello	a7ca6e2eea	Merge pull request #4293 from chrismeyersfsu/fix-ws_disconnect_log ... missing f"" on log statement	2020-05-05 11:16:13 -04:00
chris meyers	ba7e2c9bc4	missing f"" on log statement	2020-05-04 15:57:56 -04:00
Shane McDonald	e9cda0c819	Merge pull request #4292 from shanemcd/fix-inventory-plugin-permissions ... Fix permissions for vendored collections in dev env	2020-05-04 15:38:17 -04:00
Shane McDonald	a98887deb0	Update INVENTORY_COLLECTIONS_ROOT in dev env settings	2020-05-04 14:23:05 -04:00
Shane McDonald	b12c0def7d	Fix permissions for vendored collections in dev env	2020-05-04 12:44:04 -04:00
roofotpcellist	462cfa2344	UI translation strings for release_3.7.0 branch	2020-05-04 15:37:35 +00:00
Ryan Petrello	9c5f04b1e0	Merge pull request #4287 from ryanpetrello/flake8-whoops ... fix busted flake8	2020-05-01 13:52:52 -04:00
Ryan Petrello	b4b261b918	fix busted flake8	2020-05-01 13:51:37 -04:00
Ryan Petrello	cd21dd69f5	Merge pull request #4284 from ryanpetrello/more-event-sanitization-tweaks ... only sanitize project update events for the scm modules	2020-05-01 11:48:24 -04:00
Ryan Petrello	bf65b40241	only sanitize project update events for the scm modules ... these are the only modules in the project update playbook that actually utilize the SCM URL (which is what potentially contains sensitive data)	2020-05-01 11:39:46 -04:00
Ryan Petrello	99c7f2f70d	Merge pull request #4278 from elyezer/drop-awxkit-requirements-txt ... [3.7.0] Keep awxkit's requirements on the setup.py	2020-04-29 14:46:58 -04:00
Elyézer Rezende	e4921abfff	Keep awxkit's requirements on the setup.py ... awxkit's setup.py was making use of pip internal structures to parse the requirements.txt file. This is not a good thing as they may change, actually that just happened. To avoid this in the future, move the list of requirements to setup.py and make requirements.txt list `.` as the only item. This way we keep a single place to update requirements in the future and avoid accessing pip's internals.	2020-04-29 14:11:06 -04:00
Chris Meyers	cd15a5c082	Merge pull request #4275 from chrismeyersfsu/redis_throttle_reconnect ... exponential backoff on cb receiver reconnect	2020-04-28 15:42:45 -04:00
Ryan Petrello	6b976c4239	Merge pull request #4276 from rebeccahhh/release_3.7.0 ... put remaining correct links for 'Source Variables' in Source Page	2020-04-28 15:31:37 -04:00
chris meyers	a8f52c1639	actually do exponential calc rather than *2 ... * Log the time til reconnect attemp to log message rather than attempt number	2020-04-28 15:24:08 -04:00
Rebeccah	867475ad49	added in (what I believe to be) the correct links	2020-04-28 14:14:40 -04:00
chris meyers	2ecd055d1e	sleep backoff on cb receiver reconnect ... * Sleep before trying to reconnect Most common reason for entering this reconnect loop is when Redis service stops before the callback receiver when stopping tower services.	2020-04-28 12:47:40 -04:00
Ryan Petrello	0d30a67756	Merge pull request #4273 from wenottingham/certscertscerts ... Allow unsigned certs in logging if cert verification is disabled.	2020-04-28 11:17:19 -04:00
Bill Nottingham	5d24acf613	Allow unsigned certs in logging if cert verification is disabled.	2020-04-28 11:16:54 -04:00
Ryan Petrello	94692c2364	Merge pull request #4272 from chrismeyersfsu/sos_report_redis_logs ... sos report redis logs	2020-04-28 11:00:41 -04:00
Ryan Petrello	29abe35799	Merge pull request #4268 from fosterseth/fix-ip_conflict_cluster ... Unset IP address of old instance if conflicting with new instance IP	2020-04-28 10:59:27 -04:00
Seth Foster	6652464e25	Unset old instance IP when conflicting new instance IP ... With AWX_AUTO_DEPROVISION_INSTANCES on, instances are registered with an ip address. However, new instances might try to register before old instances are deprivisioned. In this case old IPs can conflict with the new ones. This will check for an ip conflict and unset the IP of conflicting instance (set to None) ansible/awx issue 6750	2020-04-28 10:52:15 -04:00
chris meyers	960aa9df16	add redis logs to sosreport ... * rhel8 /var/log/redis/redis.log * rhel7 scl location	2020-04-28 09:12:42 -04:00
Bianca Henderson	12b47405f0	Merge pull request #4265 from john-westcott-iv/release_3.7.0 ... Restructuring modules so that lookup don't happen if deleting	2020-04-27 17:39:11 -04:00
Alan Rominger	41014e62b7	Avoid applying galaxy settings if no user settings exist (#4262)	2020-04-27 16:15:11 -04:00
Ryan Petrello	e1cedcfb04	Merge pull request #4266 from rooftopcellist/rsyslog_followup ... Increase stopwait time for rsyslogd service	2020-04-27 15:26:49 -04:00
Jim Ladd	45f8f0f412	Merge pull request #4264 from jladdjr/satellite6_want_ansible_ssh_host ... Add support for satellite6_want_ansible_ssh_host	2020-04-27 11:39:03 -07:00
Christian Adams	c07b6285da	Increase stopwait time for rsyslogd service	2020-04-27 14:33:46 -04:00
John Westcott IV	f17ced8f9c	Fixing integration tests for deprecation warnings	2020-04-27 14:25:23 -04:00
John Westcott IV	7f66f084f1	Restructuring modules so that lookup don't happen if deleting	2020-04-27 14:11:23 -04:00
Jim Ladd	616e7082b3	Add support for satellite6_want_ansible_ssh_host ... * defaults to IPv6, falls back to IP	2020-04-27 11:04:56 -07:00
Chris Meyers	fa73fe76b2	Merge pull request #4263 from ansible/fix-sliding_window_3_7_0 ... fix sliding window per/minute calc	2020-04-27 13:20:39 -04:00
Ryan Petrello	efe9d85685	Merge pull request #4260 from jlmitch5/fixNotificationPagination ... make sure right endpoint is getting called for notification pagination	2020-04-27 09:18:34 -04:00
Ryan Petrello	1f1069e9f3	Merge pull request #4261 from jlmitch5/fixLicenseTranslation ... Remove unnecessary nesting license translate directive	2020-04-24 16:03:10 -04:00