Merge branch 'purge_ansible_name' into release_3.2.0

* purge_ansible_name:
  Remove ansible reference from dev PKG-INFO
  Add back in PRIVILEGE_ESCALATION_METHODS inadvertantly removed
  Add awx_ and AWX_ environment vars and extra_vars alongside Tower
  Refactor some tower periodic tasks to label as awx
  Refactor Notification backend for tower -> awx
  Refactor fact cache plugin from tower -> awx
  Rename tower display plugins to awx display
  Mass rename from ansible_(awx|tower) -> (awx|tower)
This commit is contained in:
Matthew Jones
2017-07-26 23:06:55 -04:00
62 changed files with 126 additions and 118 deletions

View File

@@ -20,7 +20,7 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework.exceptions import ParseError, PermissionDenied
from rest_framework.filters import BaseFilterBackend
# Ansible Tower
# AWX
from awx.main.utils import get_type_for_model, to_python_boolean
from awx.main.models.credential import CredentialType
from awx.main.models.rbac import RoleAncestorEntry

View File

@@ -16,7 +16,7 @@ from rest_framework import serializers
from rest_framework.relations import RelatedField, ManyRelatedField
from rest_framework.request import clone_request
# Ansible Tower
# AWX
from awx.main.models import InventorySource, NotificationTemplate

View File

@@ -1,4 +1,4 @@
The root of the Ansible Tower REST API.
The root of the REST API.
Make a GET request to this resource to obtain information about the available
API versions.

View File

@@ -1,4 +1,4 @@
Version 2 of the Ansible Tower REST API.
Version 2 of the REST API.
Make a GET request to this resource to obtain a list of all child resources
available via the API.