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
jeff
4fa0d2406a
Remove unneeded jinja endif
2018-03-14 15:16:26 +01:00
jeff
f9f91ecf81
Add ca_trust_dir to task image
2018-03-14 11:41:10 +01:00
jeff
aca74d05ae
Add 'ca_trust_dir' variable to allow Custom CA sharing between host and containers
2018-03-14 11:40:56 +01:00
jeff
4972755ccb
Fix project_data_dir templating for local_docker install
2018-03-12 14:50:44 +01:00
Ryan Petrello
6d43b8c4dd
Merge pull request #1527 from ryanpetrello/oauth2-filter
...
restrict API filtering on oauth-related fields
2018-03-12 09:43:05 -04:00
Ryan Petrello
a61187e132
restrict API filtering on oauth-related fields
...
related: https://github.com/ansible/awx/issues/1354
2018-03-12 09:16:37 -04:00
Ryan Petrello
dcab97f94f
Merge pull request #1504 from ryanpetrello/oauth2-swagger
...
properly categorize OAuth2 endpoints for swagger autogen
2018-03-09 15:27:02 -05:00
Ryan Petrello
397b9071a6
properly categorize OAuth2 endpoints for swagger autogen
2018-03-09 15:07:50 -05:00
Shane McDonald
7984bd2824
Merge pull request #1493 from jffz/devel
...
Fix for dns and dns_search templating
2018-03-09 12:52:10 -05:00
Marliana Lara
bfbbb95256
Merge pull request #1475 from marshmalien/feat/style_upgrade_page
...
Style migrations-pending page
2018-03-09 11:47:34 -05:00
Marliana Lara
882ed4d05a
Merge pull request #1497 from marshmalien/feat/display_invalid_items_onPrompt
...
Denote invalid template when no inventory and no prompt-for-inventory
2018-03-09 10:38:20 -05:00
Christian Adams
cee12c4e6c
Merge pull request #1378 from rooftopcellist/no_patch_app
...
disallow changing token-app
2018-03-09 10:33:24 -05:00
Marliana Lara
c2a3e82d29
Check Inventory ask_inventory_on_launch value when verifying template validity
2018-03-09 10:08:39 -05:00
Chris Meyers
181af03ab9
Merge pull request #1495 from chrismeyersfsu/fix-celery_rollback
...
more celery rollback
2018-03-09 09:31:31 -05:00
chris meyers
e2ed1542e6
more celery rollback
...
* Setting reload code calls a celery 4.x method signature. This changes
it back to a 3.x safe call.
2018-03-09 09:27:09 -05:00
jffz
ca27dee4fc
Fix dns and dns_search templating
...
Fix templating for dns and dns_search entries for both `awx_web` and `awx_task` images.
Multiple entries were templated in a oneliner style while docker-compose wanted them in a list style.
2018-03-09 11:04:26 +01:00
Christian Adams
8a25342ce5
Merge pull request #1373 from rooftopcellist/oauth_doc_csrf
...
update docs
2018-03-08 18:15:04 -05:00
Alan Rominger
b41d9c4620
Merge pull request #1470 from AlanCoding/mo_exceptions
...
Include stack trace for delete_inventory logs
2018-03-08 17:18:40 -05:00
adamscmRH
91c0f2da6f
simplifies detail serializer
2018-03-08 14:55:25 -05:00
Matthew Jones
b11b1acc68
Update middleware warning for latest minor version
2018-03-08 12:54:26 -05:00
adamscmRH
9b195bc80f
fix oauth docs
2018-03-08 12:44:53 -05:00
adamscmRH
fd7c078a8b
update docs
2018-03-08 12:10:29 -05:00
adamscmRH
06bacd7bdc
add serializer for token detail
2018-03-08 12:03:50 -05:00
Marliana Lara
6f23147d98
Style migrations/pending page
2018-03-08 11:47:59 -05:00
Alan Rominger
3605dbfd73
Merge pull request #1472 from AlanCoding/more_deps
...
Add shade back into AWX requirements
2018-03-08 11:04:20 -05:00
Michael Abashian
599d84403b
Merge pull request #1425 from mabashian/169-credentials
...
Added add/replace credential validation on jt launch and schedule
2018-03-08 10:57:27 -05:00
AlanCoding
4a01805a19
add shade back into AWX requirements
...
Last round of dependency updates showed that AWX
depended on packages which came implicitly from shade
decorator is added as an explicit dependency
and all of the rest of shade requirements are
added back in here.
2018-03-08 10:32:19 -05:00
Michael Abashian
c580146c77
Merge branch 'devel' into 169-credentials
2018-03-08 10:03:29 -05:00
mabashian
ce3dc40649
Edit schedule credential prompting code cleanup
2018-03-08 09:58:31 -05:00
Shane McDonald
5bf2e00d24
Merge pull request #1471 from shanemcd/devel
...
Fix container boots on AppArmor protected systems
2018-03-08 09:44:33 -05:00
Shane McDonald
02102f5ba8
Fix container boots on AppArmor protected systems
...
Link https://github.com/ansible/awx/issues/1297
Signed-off-by: Shane McDonald <me@shanemcd.com>
2018-03-08 09:41:04 -05:00
Shane McDonald
2861397433
Set imagePullPolicy to Always
...
Not sure why we werent doing this before.
2018-03-08 09:41:04 -05:00
AlanCoding
54a68da088
include stack trace for delete_inventory logs
2018-03-08 08:30:59 -05:00
Alan Rominger
044b85ce7a
Merge pull request #1415 from AlanCoding/depgrades
...
Dependency Upgrades
2018-03-08 08:29:46 -05:00
Michael Abashian
b970452950
Merge pull request #1441 from marshmalien/feat/display_invalid_items
...
Denote invalid job templates and scheduled jobs
2018-03-07 15:26:13 -05:00
adamscmRH
f485a04dfc
disallow changing token-app
2018-03-07 15:13:56 -05:00
mabashian
a5043029c1
Implemented the ability to specify credentials when creating a scheduled job run. Added validation for removing but not replacing default credentials.
2018-03-07 11:57:31 -05:00
Matthew Jones
61a48996ee
Merge pull request #1459 from rooftopcellist/update_session_setting
...
add csrf & session settings
2018-03-07 08:41:17 -08:00
Jake McDermott
8f58d0b998
Merge pull request #1455 from ansible/jakemcdermott-patch-2
...
auto hide multi credential scrollbar
2018-03-07 11:33:29 -05:00
adamscmRH
0490bca268
add csrf & session settings
2018-03-07 09:32:24 -05:00
Christian Adams
095515bb56
Merge pull request #1458 from rooftopcellist/fix_expiration
...
Fix expiration
2018-03-07 08:13:25 -05:00
adamscmRH
efaa698939
fix token expiration time
2018-03-07 00:42:44 -05:00
AlanCoding
556e6c4a11
Dependency Updates
...
Upgrades of minor dependency upgrades
Inventory scripts were upgraded in separate commit
Major exclusions from this update
- celery was already downgraded for other reasons
- Django / DRF major update already done, minor bumps here
- asgi-amqp has fixes coming independently, not touched
- TACACS plus added features not needed
Removals of note
- remove shade from AWX requirements
- remove kombu from Ansible requirements
Other notes
Add note about pinning setuptools and pip,
done but not mentioned previously
Stop pinning gevent-websocket and twisted
upgrade Azure to Ansible core requirements
more detailed notes
https://gist.github.com/AlanCoding/9442a512ab6977940bc7b5b346d4f70b
upgrade version of Django for Exception
2018-03-06 16:04:01 -05:00
Matthew Jones
8421d2b0d2
Merge pull request #1457 from matburt/remove_old_migrations
...
Remove old south migrations from before a previous django upgrade
2018-03-06 12:59:32 -08:00
Jake McDermott
f8ca0a613f
Update prompt.block.less
2018-03-06 14:56:38 -05:00
Christian Adams
db91e30464
Merge pull request #1449 from rooftopcellist/fix_exp_time
...
fix token expiration time
2018-03-06 14:55:38 -05:00
Matthew Jones
d19ef60d97
Remove old south migrations from before a previous django upgrade
2018-03-06 14:47:09 -05:00
Jake McDermott
5971d79a8f
auto hide multi credential scrollbar
2018-03-06 14:33:28 -05:00
Wayne Witzel III
a3b2f29478
Merge pull request #1454 from wwitzel3/fix-role-summary
...
Fix role summary when role description is overloaded
2018-03-06 14:03:22 -05:00
