External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-17 11:10:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Removed references to tower in InventorySource and Credentials

Browse Source 
--- Removed reference to tower in  InventorySource and InventoryUpdate model
--- Added a migration for above change
--- Added new CONTROLLER* variables in awx/main/models/credentials/__init__.py
--- Migrated awxkit to new CONTROLLER* variables
--- Updated the tests to use new CONTROLLER* variables
--- Fix some issues with upgrade path, rename more cases
This commit is contained in:
Amol Gautam
2021-06-10 13:32:38 -04:00
committed by Shane McDonald
parent 645f7f6dac
commit b64c2d6861
18 changed files with 171 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awxkit/awxkit/cli/docs/source/authentication.rst
View File

@@ -12,9 +12,9 @@ The preferred mechanism for authenticating with AWX and |RHAT| is by generating
.. code:: bash
TOWER_HOST=https://awx.example.org \
TOWER_USERNAME=alice \
TOWER_PASSWORD=secret \
CONTROLLER_HOST=https://awx.example.org \
CONTROLLER_USERNAME=alice \
CONTROLLER_PASSWORD=secret \
awx login
As a convenience, the ``awx login -f human`` command prints a shell-formatted token
@@ -22,15 +22,15 @@ value:
.. code:: bash
export TOWER_OAUTH_TOKEN=6E5SXhld7AMOhpRveZsLJQsfs9VS8U
export CONTROLLER_OAUTH_TOKEN=6E5SXhld7AMOhpRveZsLJQsfs9VS8U
By ingesting this token, you can run subsequent CLI commands without having to
specify your username and password each time:
.. code:: bash
export TOWER_HOST=https://awx.example.org
$(TOWER_USERNAME=alice TOWER_PASSWORD=secret awx login -f human)
export CONTROLLER_HOST=https://awx.example.org
$(CONTROLLER_USERNAME=alice CONTROLLER_PASSWORD=secret awx login -f human)
awx config
Working with OAuth2.0 Applications
@@ -43,7 +43,7 @@ application was created.
.. code:: bash
TOWER_USERNAME=alice TOWER_PASSWORD=secret awx login \
CONTROLLER_USERNAME=alice CONTROLLER_PASSWORD=secret awx login \
--conf.client_id <value> --conf.client_secret <value>
@@ -55,7 +55,7 @@ a read-only token, specify ``--scope read``:
.. code:: bash
TOWER_USERNAME=alice TOWER_PASSWORD=secret \
CONTROLLER_USERNAME=alice CONTROLLER_PASSWORD=secret \
awx login --conf.scope read
Session Authentication
@@ -65,5 +65,5 @@ specify your username and password on every invocation:
.. code:: bash
TOWER_USERNAME=alice TOWER_PASSWORD=secret awx jobs list
CONTROLLER_USERNAME=alice CONTROLLER_PASSWORD=secret awx jobs list
awx --conf.username alice --conf.password secret jobs list

2
awxkit/awxkit/cli/docs/source/output.rst
View File

@@ -54,4 +54,4 @@ Colorized Output
By default, |prog| prints colorized output using ANSI color codes. To disable
this functionality, specify ``--conf.color f`` or set the environment variable
``TOWER_COLOR=f``.
``CONTROLLER_COLOR=f``.

10
awxkit/awxkit/cli/docs/source/usage.rst
View File

@@ -77,17 +77,17 @@ A few of the most important ones are:
``-f, --conf.format``
used to specify a custom output format (the default is json)
``--conf.host, TOWER_HOST``
``--conf.host, CONTROLLER_HOST``
the full URL of the AWX/|RHAT| host (i.e., https://my.awx.example.org)
``-k, --conf.insecure, TOWER_VERIFY_SSL``
``-k, --conf.insecure, CONTROLLER_VERIFY_SSL``
allows insecure server connections when using SSL
``--conf.username, TOWER_USERNAME``
``--conf.username, CONTROLLER_USERNAME``
the AWX username to use for authentication
``--conf.password, TOWER_PASSWORD``
``--conf.password, CONTROLLER_PASSWORD``
the AWX password to use for authentication
``--conf.token, TOWER_OAUTH_TOKEN``
``--conf.token, CONTROLLER_OAUTH_TOKEN``
an OAuth2.0 token to use for authentication