mirror of
https://github.com/ansible/awx.git
synced 2026-02-01 01:28:09 -03:30
Merge branch 'release_3.2.1' into devel
* release_3.2.1: fallback to empty dict when processing extra_data fix migration problem from 3.1.1 move 0005a migration to 0005b feedback on ad hoc prohibited vars error msg Fix the way we include i18n files in sdist Fix migrations to support 3.1.2 -> 3.2.1+ upgrade path fix missing parameter to update_capacity method fix WARNING log when launching ad hoc command Validate against ansible variables on ad hoc launch do not allow ansible connection type of local for ad_hoc work around an ansible 2.4 inventory caching bug fix scan job migration unicode issue Assert isolated nodes have capacity set to 0 and restored based on version Set capacity to zero if the isolated node has an old version
This commit is contained in:
4
setup.py
4
setup.py
@@ -155,9 +155,7 @@ setup(
|
||||
},
|
||||
data_files = proc_data_files([
|
||||
("%s" % homedir, ["config/wsgi.py",
|
||||
"awx/static/favicon.ico",
|
||||
"awx/locale/*/LC_MESSAGES/*.po",
|
||||
"awx/locale/*/LC_MESSAGES/*.mo"]),
|
||||
"awx/static/favicon.ico"]),
|
||||
("%s" % siteconfig, ["config/awx-nginx.conf"]),
|
||||
# ("%s" % webconfig, ["config/uwsgi_params"]),
|
||||
("%s" % sharedir, ["tools/scripts/request_tower_configuration.sh","tools/scripts/request_tower_configuration.ps1"]),
|
||||
|
||||
Reference in New Issue
Block a user