Skip to content

Commit

Permalink
fixes and clarifications
Browse files Browse the repository at this point in the history
  • Loading branch information
ivarmu committed Jul 16, 2024
1 parent ec6013e commit a11aeea
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 9 deletions.
50 changes: 43 additions & 7 deletions docs/documentation/modules/ROOT/pages/020-export.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,26 @@ It must be `ansible-navigator>=3.4.2`, and can be installed with the following c
[.console-input]
[source,console]
----
python3 -m pip install ansible-navigator>=3.4.2 --user
python3 -m pip install --user ansible-navigator>=3.4.2
----

[NOTE]
====
Check the installed version with the following command:
[.console-input]
[source,console]
----
ansible-navigator --version
----
If a previous version was installed, it can be upgraded with the following command:
[.console-input]
[source,console]
----
python3 -m pip install --user --upgrade ansible-navigator>=3.4.2
----
====

=== ansible-builder (optional)

It is optional if interested in the bonus steps.
Expand All @@ -23,6 +40,24 @@ It must be `ansible-builder>=3.0.0`, and can be installed with the following com
python3 -m pip install ansible-builder>=3.0.0 --user
----

[NOTE]
====
Check the installed version with the following command:
[.console-input]
[source,console]
----
ansible-builder --version
----
If a previous version was installed, it can be upgraded with the following command:
[.console-input]
[source,console]
----
python3 -m pip install --user --upgrade ansible-builder>=3.0.0
----
====


[#Export]
== Export all the variables to be used in the next steps

Expand All @@ -38,8 +73,9 @@ The shell that is expected to be used to run the snippet below is `bash`.
[.console-input]
[source,console]
----
read -e -p ">>> User Name: " USERNAME
read -e -p ">>> Password: " -s PASSWORD
read -e -p ">>> GitHub Username: " GITHUB_USERNAME
read -e -p ">>> AWX Admin User Name: " AWX_USERNAME
read -e -p ">>> AWX Admin Password: " -s AWX_PASSWORD
read -e -p ">>> AWX Hostname: " AWX_HOSTNAME
read -e -p ">>> Validate Certs (yes/no): " -i no AWX_VALIDATE_CERTS
read -e -p ">>> Is AAP (yes/no): " -i no IS_AAP
Expand All @@ -49,14 +85,14 @@ read -e -p ">>> Vault Password: " -s VAULT_PASSWORD

== Fork and clone the GitHub repository

The first step is to fork the repository and clone it to start working. The GitHub `<USERNAME>` will be used in the commands below and it must be replaced with your own username:
The first step is to fork the Git repository https://github.com/automationiberia/migrate-awx-to-controller/ and clone it to start working. The GitHub `<GITHUB_USERNAME>` variable will be used in the commands below as it's been populated with your own username in the previous step:

====
.Fork the repository
image::github_fork_1.png[]
====
====
.Give it a name into your `<USERNAME>` organization
.Give it a name into your `<GITHUB_USERNAME>` organization
image::github_fork_2.png[]
====
====
Expand Down Expand Up @@ -90,8 +126,8 @@ The next step is to configure the files to let the playbooks to connect to the A
cat > my_vars/vault-awx.yaml <<EOF
---
# AWX
vault_controller_username: "${USERNAME}"
vault_controller_password: "${PASSWORD}"
vault_controller_username: "${AWX_USERNAME}"
vault_controller_password: "${AWX_PASSWORD}"
vault_controller_hostname: "${AWX_HOSTNAME}"
vault_controller_validate_certs: ${AWX_VALIDATE_CERTS}
is_aap: ${IS_AAP}
Expand Down
4 changes: 2 additions & 2 deletions docs/documentation/modules/ROOT/pages/023-import.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ NOTE: The `Vault Password` variable used here should be the same as the one used
[.console-input]
[source,console]
----
read -e -p ">>> User Name: " CONTROLLER_USERNAME
read -e -p ">>> Password: " -s CONTROLLER_PASSWORD
read -e -p ">>> Ansible Controller Admin User Name: " CONTROLLER_USERNAME
read -e -p ">>> Ansible Controller Admin Password: " -s CONTROLLER_PASSWORD
read -e -p ">>> Ansible Controller Hostname: " CONTROLLER_HOSTNAME
read -e -p ">>> Validate Certs (yes/no): " -i no CONTROLLER_VALIDATE_CERTS
read -e -p ">>> Is AAP (yes/no): " -i yes IS_AAP
Expand Down

0 comments on commit a11aeea

Please sign in to comment.