Skip to content

Commit 34e2641

Browse files
Merge pull request #284 from branic/readme_updates
Update readme's to remove references to Tower
2 parents 9d65062 + 897dbcb commit 34e2641

File tree

4 files changed

+59
-30
lines changed

4 files changed

+59
-30
lines changed

README.md

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# Red Hat Communties of Practice Controller Configuration Collection
22

3-
![Ansible Lint](https://github.com/redhat-cop/tower_configuration/workflows/Ansible%20Lint/badge.svg)
4-
![Galaxy Release](https://github.com/redhat-cop/tower_configuration/workflows/galaxy-release/badge.svg)
3+
![Ansible Lint](https://github.com/redhat-cop/controller_configuration/workflows/Ansible%20Lint/badge.svg)
4+
![Galaxy Release](https://github.com/redhat-cop/controller_configuration/workflows/galaxy-release/badge.svg)
55
<!-- Further CI badges go here as above -->
66

77
This Ansible collection allows for easy interaction with an AWX or Ansible Controller server via Ansible roles using the AWX/Controller collection modules.
88

9-
# REQUIREMENTS
10-
The AWX.AWX OR ANSIBLE.TOWER collections MUST be installed in order for this collection to work. It is recomended they be invoked in the playbook in the following way.
9+
## REQUIREMENTS
10+
11+
The AWX.AWX OR ANSIBLE.CONTROLLER collections MUST be installed in order for this collection to work. It is recommended they be invoked in the playbook in the following way.
1112

1213
```yaml
1314
---
@@ -28,7 +29,9 @@ Click the `Content` button to see the list of content included in this collectio
2829

2930
You can install the redhat_cop controller_configuration collection with the Ansible Galaxy CLI:
3031

31-
ansible-galaxy collection install redhat_cop.controller_configuration
32+
```console
33+
ansible-galaxy collection install redhat_cop.controller_configuration
34+
```
3235

3336
You can also include it in a `requirements.yml` file and install it with `ansible-galaxy collection install -r requirements.yml`, using the format:
3437

@@ -39,17 +42,23 @@ collections:
3942
# If you need a specific version of the collection, you can specify like this:
4043
# version: ...
4144
```
45+
4246
## Conversion from Tower_configuration
47+
4348
If you were using a version of redhat_cop.tower_configuration, please refer to our Conversion Guide here: [Conversion Guide](docs/CONVERSION_GUIDE.md)
4449

4550
## Using this collection
51+
4652
The awx.awx or ansible.controller collection must be invoked in the playbook in order for ansible to pick up the correct modules to use.
4753

4854
The following command will invoke the playbook with the awx collection
55+
4956
```console
5057
ansible-playbook redhat_cop.controller_configuration.configure_awx.yml
5158
```
59+
5260
The following command will invoke the playbook with the ansible.controller collection
61+
5362
```console
5463
ansible-playbook redhat_cop.controller_configuration.configure_controller.yml
5564
```
@@ -71,31 +80,32 @@ Define following vars here, or in `controller_configs/controller_auth.yml`
7180

7281
You can also specify authentication by a combination of either:
7382

74-
- `controller_hostname`, `controller_username`, `controller_password`
75-
- `controller_hostname`, `controller_oauthtoken`
83+
- `controller_hostname`, `controller_username`, `controller_password`
84+
- `controller_hostname`, `controller_oauthtoken`
7685

77-
The OAuth2 token is the preferred method. You can obtain the token through the prefered `controller_token` module, or through the
78-
AWX CLI [login](https://docs.ansible.com/ansible-tower/latest/html/towercli/reference.html#awx-login)
86+
The OAuth2 token is the preferred method. You can obtain the token through the preferred `controller_token` module, or through the
87+
AWX CLI [login](https://docs.ansible.com/automation-controller/latest/html/controllercli/authentication.html)
7988
command.
8089

8190
These can be specified via (from highest to lowest precedence):
8291

83-
- direct role variables as mentioned above
84-
- environment variables (most useful when running against localhost)
85-
- a config file path specified by the `controller_config_file` parameter
86-
- a config file at `~/.controller_cli.cfg`
87-
- a config file at `/etc/controller/controller_cli.cfg`
92+
- direct role variables as mentioned above
93+
- environment variables (most useful when running against localhost)
94+
- a config file path specified by the `controller_config_file` parameter
95+
- a config file at `~/.controller_cli.cfg`
96+
- a config file at `/etc/controller/controller_cli.cfg`
8897

8998
Config file syntax looks like this:
9099

91-
```
100+
```ini
92101
[general]
93102
host = https://localhost:8043
94103
verify_ssl = true
95104
oauth_token = LEdCpKVKc4znzffcpQL5vLG8oyeku6
96105
```
97106

98107
Controller token module would be invoked with this code:
108+
99109
```yaml
100110
- name: Create a new token using controller username/password
101111
awx.awx.token:
@@ -109,26 +119,29 @@ Controller token module would be invoked with this code:
109119
```
110120

111121
### Controller Export
122+
112123
The awx command line can export json that is compatable with this collection.
113124
More details can be found [here](examples/configs_export_model/README.md)
114125

115-
### See Also:
126+
### See Also
116127

117-
* [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
128+
- [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
118129

119130
## Release and Upgrade Notes
131+
120132
For details on changes between versions, please see [the changelog for this collection](CHANGELOG.rst).
121133

122134
## Roadmap
135+
123136
Adding the ability to use direct output from the awx export command in the roles along with the current data model.
124137

125138
## Contributing to this collection
126139

127-
We welcome community contributions to this collection. If you find problems, please open an issue or create a PR against the [Controller Configuration collection repository](https://github.com/redhat-cop/tower_configuration).
128-
More information about contributing can be found in our [Contribution Guidelines.](https://github.com/redhat-cop/tower_configuration/blob/devel/.github/CONTRIBUTING.md)
140+
We welcome community contributions to this collection. If you find problems, please open an issue or create a PR against the [Controller Configuration collection repository](https://github.com/redhat-cop/controller_configuration).
141+
More information about contributing can be found in our [Contribution Guidelines.](https://github.com/redhat-cop/controller_configuration/blob/devel/.github/CONTRIBUTING.md)
129142

130143
## Licensing
131144

132145
GNU General Public License v3.0 or later.
133146

134-
See [LICENCE](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.
147+
See [LICENSE](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.

docs/CONVERSION_GUIDE.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# Red Hat Communties of Practice Controller Configuration Collection Conversion Guide
22

3-
# REQUIREMENTS
4-
The AWX.AWX OR ANSIBLE.TOWER collections MUST be installed in order for this collection to work. It is recomended they be invoked in the playbook in the following way.
3+
## REQUIREMENTS
4+
5+
The AWX.AWX OR ANSIBLE.CONTROLLER collections MUST be installed in order for this collection to work. It is recommended they be invoked in the playbook in the following way.
56

67
## Using this collection
8+
79
The awx.awx or ansible.controller collection must be invoked in the playbook in order for ansible to pick up the correct modules to use.
810

911
Otherwise it will look for the modules only in your base installation. If there are errors complaining about "couldn't resolve module/action" this is the most likely cause.
@@ -19,9 +21,10 @@ Otherwise it will look for the modules only in your base installation. If there
1921
- redhat_cop.controller_configuration
2022
```
2123
22-
# Variable name changes
24+
## Variable name changes
2325
2426
### Major Variable names changed
27+
2528
The Following Variables need to be changed:
2629
|Tower Variable Name|Controller Variable Name|
2730
|:---:|:---:|
@@ -54,6 +57,7 @@ The Following Variables need to be changed:
5457
|`tower_workflow_launch_jobs`|`controller_workflow_launch_jobs`|
5558

5659
### Authentication Credentials
60+
5761
|Tower Variable Name|Controller Variable Name|
5862
|:---:|:---:|
5963
|`tower_username`|`controller_username`|
@@ -66,10 +70,12 @@ The Following Variables need to be changed:
6670
### Specific Changes in Roles
6771

6872
### Projects
73+
6974
|Tower Variable Name|Controller Variable Name|Reason|
7075
|:---:|:---:|:---:|
71-
|`default_environment`|`custom_virtualenv`|`enviroments now refer to Execution Enviroments`|
76+
|`default_environment`|`custom_virtualenv`|`environments now refer to Execution Environments`|
7277

7378
## Notes
79+
7480
Making these changes should be all the ones you need to make in order to use the updated collection.
7581
However there have been many changes and this list is in no way final or all encompassing.

docs/STANDARDS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
## Contributor's Guidelines
2+
# Contributor's Guidelines
33

44
- All YAML files named with '.yml' extension
55
- Use spaces around jinja variables. {{ var }} over {{var}}
@@ -10,4 +10,4 @@
1010
- Paths - When defining paths, do not include trailing slashes (e.g. my_path: /foo not my_path: /foo/). When concatenating paths, follow the same convention (e.g. {{ my_path }}/bar not {{ my_path }}bar)
1111
- Indentation - Use 2 spaces for each indent
1212
- `vars/` vs `defaults/` - if you have variables that don't need to change or be overridden by user, put those in `vars/` and those that a user would likely override, put those under `defaults/` directory.
13-
- All playbooks/roles should be focused on compatibility with Ansible Tower
13+
- All playbooks/roles should be focused on compatibility with Automation Controller

examples/configs_export_model/README.md

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
1-
# Ansible Tower Export Documentation
1+
# Automation Controller Export Documentation
22

33
## Description
4-
This is documentation on how to use a the Tower export commands in development.
54

6-
This command for awx allows you to export all available endpoints for tower for use in import, use in your own templates, for backup and many other uses.
5+
This is documentation on how to use a the Automation Controller export commands in development.
6+
7+
This command allows exporting all available endpoints for Automation Controller for use in importing, templates, backups and many other uses.
78

89
## Installation
9-
pip install awxkit
10+
11+
```console
12+
pip3 install awxkit
13+
```
1014

1115
## Basic command options
16+
17+
```console
1218
awx export --conf.host https://localhost --conf.username admin --conf.password ******** --conf.insecure --help
19+
```
1320

21+
```console
1422
awx export --conf.host https://localhost --conf.username admin --conf.password ******** --conf.insecure --job_templates
23+
```
1524

1625
## Available options for this command
26+
1727
|Option|
1828
|:---:|
1929
|users|

0 commit comments

Comments
 (0)