1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Commit Graph

20327 Commits

Author SHA1 Message Date
softwarefactory-project-zuul[bot]
9479b1b824
Merge pull request #3535 from shanemcd/oops
Fix bug where init scripts didnt create the admin user correctly

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-28 00:39:05 +00:00
Shane McDonald
fcf6b4ae45 Fix bug where init scripts didnt create the admin user correctly 2019-03-27 19:43:47 -04:00
softwarefactory-project-zuul[bot]
7b4c63037a
Merge pull request #3523 from ryanpetrello/iso-cancel
properly handle isolated cancellation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-27 22:44:10 +00:00
softwarefactory-project-zuul[bot]
37a90320ec
Merge pull request #3532 from jbradberry/double-jeopardy
Log errors directly from inventory_import.py only if running by hand

Reviewed-by: awxbot
             https://github.com/awxbot
2019-03-27 22:27:58 +00:00
Jeff Bradberry
a803e86a95 Log errors directly from inventory_import.py only if running by hand 2019-03-27 18:02:46 -04:00
softwarefactory-project-zuul[bot]
196a6ff36c
Merge pull request #3525 from shanemcd/make-things-work
Fix docker-compose installs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-27 17:38:36 +00:00
Shane McDonald
c3ba851908 Fix docker-compose installs
In a series of unfortunate events, my patch yesterday didnt actually work. This fixes that.
2019-03-27 13:06:55 -04:00
softwarefactory-project-zuul[bot]
11223472d3
Merge pull request #3524 from kdelee/update_install_docs
update install docs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-27 16:26:03 +00:00
softwarefactory-project-zuul[bot]
d0a996b139
Merge pull request #3520 from ryanpetrello/runner131
pin runner 1.3.1

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-27 15:58:34 +00:00
Elijah DeLee
7dd635cd8d update install docs 2019-03-27 11:54:33 -04:00
softwarefactory-project-zuul[bot]
f715e4e410
Merge pull request #3519 from chrismeyersfsu/fix-iso_bwrap
runner expects process isolation flags in settings

Reviewed-by: awxbot
             https://github.com/awxbot
2019-03-27 15:49:24 +00:00
Ryan Petrello
a983d4bc1f
properly handle isolated cancellation 2019-03-27 11:44:26 -04:00
Ryan Petrello
f7cffbfe5c
pin runner 1.3.1 2019-03-27 11:23:25 -04:00
chris meyers
2329079326 runner expects process isolation flags in settings
* Towards the goal of converging the iso code path w/ the non-iso code
path. More process isolation control flags into settings.
2019-03-27 11:08:41 -04:00
softwarefactory-project-zuul[bot]
055e7b4974
Merge pull request #3515 from shanemcd/docker-compose-permissions
Fix permissions of sensitive files in docker-compose installation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-27 14:11:31 +00:00
Shane McDonald
c44bf6f903 Allow for platform specific variables in docker-compose install
This changes the default docker_compose_dir on macos to a writeable location
2019-03-27 09:32:04 -04:00
Shane McDonald
a6d031f46f Fix permissions of sensitive files in docker-compose installation 2019-03-27 09:31:10 -04:00
softwarefactory-project-zuul[bot]
2129f12085
Merge pull request #3505 from shanemcd/devel
Address CVE-2019-3869

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-26 19:38:28 +00:00
softwarefactory-project-zuul[bot]
23185ca22f
Merge pull request #3232 from AlanCoding/truly_empty_groups
Surface empty groups as children of all group

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-26 19:17:36 +00:00
Shane McDonald
2b6cf97157 Do not set credentials via environment variables 2019-03-26 15:13:28 -04:00
Shane McDonald
07e5a00f14 Remove “standalone Docker” installation path
This has been a burden to maintain. docker-compose is now required
2019-03-26 15:13:28 -04:00
softwarefactory-project-zuul[bot]
1b0f5b05ad
Merge pull request #3502 from marshmalien/feat-toolbar-sort-instance-modal-list
Feat toolbar sort instance modal list

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-26 18:57:24 +00:00
softwarefactory-project-zuul[bot]
5ff4625eb1
Merge pull request #3280 from AlanCoding/playbook_dir
Set --playbook-dir in calls to ansible-inventory

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-26 18:53:12 +00:00
Marliana Lara
1829e7cad4
Add sort toolbar to instance modal 2019-03-26 14:34:33 -04:00
AlanCoding
e097f5a021
implement playbook-dir option in ansible-inventory calls 2019-03-26 14:09:08 -04:00
softwarefactory-project-zuul[bot]
caa5596386
Merge pull request #3320 from vismay-golwala/custom_venvs
Feature: custom virtual environment directories

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-26 16:26:50 +00:00
Vismay Golwala
ec390b049d Feature: custom virtual environment directories
Currently, users are allowed to define virtual environments in
`settings.BASE_VENV_PATH` only, because that's the only place
Tower looks for virtual environments. This feature allows users
to custom define the directory paths, using API or UI, to look
for virtual environments. Tower aggregates virtual environments
from all these paths, except environments with special name `awx`.

Signed-off-by: Vismay Golwala <vgolwala@redhat.com>
2019-03-26 12:04:17 -04:00
softwarefactory-project-zuul[bot]
0814a9c4a1
Merge pull request #3266 from ansible/inventory_plugins
Transition to inventory plugins

Reviewed-by: Alan Rominger <arominge@redhat.com>
             https://github.com/AlanCoding
2019-03-26 15:14:27 +00:00
Marliana Lara
0a1b220f56
Link to instances list via sref directive 2019-03-26 10:35:22 -04:00
AlanCoding
d39b3b3165
Remove compatibility_mode field, simplify jinja2 syntax
fix minor bug where credential not shown in API
2019-03-26 10:29:39 -04:00
AlanCoding
19ad7d3983
Inventory plugins data tweaks and finalization
Disable use of azure_rm inventory plugin
Disable use of ec2 inventory plugin
due to compatibility issues that are unresolved

Fix conflicts with ansible runner integration

Add additional content enabled by Ansible core changes
2019-03-26 10:29:39 -04:00
AlanCoding
cd7e358b73
Inventory plugins transition dev finishing work
Bump keystone auth to resolve problem with openstack script

Clarify code path, routing to template vs. managed injector
  behavior is also now reflected in test data files

Refactor test data layout for inventory injector logic

Add developer docs for inventory plugins transition

Memoize only get_ansible_version with no parameters

Make inventory plugin injector enablement a separate
  concept from the initial_version
  switch tests to look for plugin_name as well

Add plugin injectors for tower and foreman.

Add jinja2 native types compat feature

move tower source license compare logic to management command

introduce inventory source compat mode

pin jinja2 for native Ansible types

Add parent group keys, and additional translations

manual dash sanitization for un-region-like ec2 groups

nest zones under regions using Ansible core feature just merged
  implement conditionally only with BOTH group_by options

Make compat mode default be true
  in API models, UI add and edit controllers

Add several additional hostvars to translation
Add Azure tags null case translation

Make Azure group_by key off source_vars
  to be consistent with the script

support top-level ec2 boto_profile setting
2019-03-26 10:29:39 -04:00
AlanCoding
bc5881ad21
Primary development of inventory plugins, partial compat layer
Initialize some inventory plugin test data files
Implement openstack inventory plugin

This may be removed later:
- port non-JSON line strip method from core

Dupliate effort with AWX mainline devel
- Produce ansible_version related to venv

Refactor some of injector management, moving more
  of this overhead into tasks.py, when it comes to
  managing injector kwargs

Upgrade and move openstack inventory script
  sync up parameters

Add extremely detailed logic to inventory file creation
for ec2, Azure, and gce so that they are closer to a
genuine superset of what the contrib script used to give.
2019-03-26 10:29:39 -04:00
Jim Ladd
dd854baba2
Add support for Azure inventory plugin 2019-03-26 10:29:39 -04:00
Jim Ladd
7cce3cad06
Add support for ec2 inventory plugin 2019-03-26 10:29:38 -04:00
AlanCoding
622fbc116b
move script injection logic to inventory file 2019-03-26 10:29:38 -04:00
AlanCoding
b9d489c788
Use randomized file names for injector credential files 2019-03-26 10:29:38 -04:00
AlanCoding
5cbcfbe0c6
Port inventory source injector tests to functional tests
This new batch of tests assures that the injector logic
for inventory source in their old script version remains
untouched with the refactoring underway.

Plugins are also tested by the same means of comparing
to reference files, these will be used to assure that
all parameters that used to be respected are still
respected in the plugin system.
2019-03-26 10:29:38 -04:00
Jim Ladd
d46a403a49
GCE plugin should not set any regions when 'all' specified 2019-03-26 10:29:38 -04:00
Jim Ladd
de808d4911
Only install futures on py2 2019-03-26 10:29:38 -04:00
AlanCoding
43eff55fd4
fix bugs related to python3 2019-03-26 10:29:37 -04:00
AlanCoding
6c130fa6c3
Build-in inventory plugin code structure with gce working
supporting and related changes
 - Fix inconsistency between can_update / can_start
 - Avoid creating inventory file twice unnecessarily
 - Non-functional consolidation in Azure injection logic
 - Inject GCE creds as indented JSON for readability
 - Create new injector class structure, add gce
 - Reduce management command overrides of runtime environment
2019-03-26 10:29:35 -04:00
softwarefactory-project-zuul[bot]
90ea9a8cc4
Merge pull request #3500 from Spredzy/etc_ssh
bwrap/runner: Add /etc/ssh in bind mounted folder

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-26 12:27:43 +00:00
softwarefactory-project-zuul[bot]
b09bca54b7
Merge pull request #3499 from rooftopcellist/content-oauth
update content-type for oauth2 docs

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-26 12:07:32 +00:00
Ryan Petrello
8e4a87d0af
fix tests for add /etc/ssh in bind mounted folder 2019-03-26 08:04:16 -04:00
Yanis Guenane
fd50feb258 bwrap/runner: Add /etc/ssh in bind mounted folder
/etc/ssh is currently not bound when run into bwrap, this leads to
error like "Bad owner or permissions on /etc/ssh/ssh_config.d/05-redhat.conf"
since it cannot access this file.

https://github.com/ansible/awx/pull/3391 was done pre runner
integration.

Fixes: https://github.com/ansible/awx/issues/3392

Signed-off-by: Yanis Guenane <yanis@guenane.org>
2019-03-26 12:43:59 +01:00
AlanCoding
f749a5d44d
Surface empty groups as children of all group 2019-03-26 07:18:52 -04:00
Christian Adams
c3366db5ca update content-type for oauth2 docs 2019-03-25 23:55:56 -04:00
softwarefactory-project-zuul[bot]
07a9cd106e
Merge pull request #3494 from ryanpetrello/more-iso
more iso cleanup and bug fixes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-03-25 23:21:06 +00:00
Ryan Petrello
b2a1824d21
store set_stat data for isolated job runs 2019-03-25 18:53:42 -04:00