diff --git a/ansible-ipi-install/playbook.yml b/ansible-ipi-install/playbook.yml index 039500409f..416f792b57 100644 --- a/ansible-ipi-install/playbook.yml +++ b/ansible-ipi-install/playbook.yml @@ -2,7 +2,7 @@ - name: IPI on Baremetal Installation Playbook hosts: provisioner roles: - - node-prep + - node_prep - installer environment: diff --git a/ansible-ipi-install/roles/node-prep b/ansible-ipi-install/roles/node-prep new file mode 120000 index 0000000000..01a16747a8 --- /dev/null +++ b/ansible-ipi-install/roles/node-prep @@ -0,0 +1 @@ +node_prep \ No newline at end of file diff --git a/ansible-ipi-install/roles/node-prep/handlers/main.yml b/ansible-ipi-install/roles/node-prep/handlers/main.yml deleted file mode 100644 index 190d34d9ff..0000000000 --- a/ansible-ipi-install/roles/node-prep/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for node-prep diff --git a/ansible-ipi-install/roles/node-prep/defaults/main.yml b/ansible-ipi-install/roles/node_prep/defaults/main.yml similarity index 93% rename from ansible-ipi-install/roles/node-prep/defaults/main.yml rename to ansible-ipi-install/roles/node_prep/defaults/main.yml index 8c3ae5ea79..bdd080af5f 100644 --- a/ansible-ipi-install/roles/node-prep/defaults/main.yml +++ b/ansible-ipi-install/roles/node_prep/defaults/main.yml @@ -1,5 +1,5 @@ --- -# defaults file for node-prep +# defaults file for node_prep activation_key: "" org_id: "" network_type: "OVNKubernetes" diff --git a/ansible-ipi-install/roles/node_prep/handlers/main.yml b/ansible-ipi-install/roles/node_prep/handlers/main.yml new file mode 100644 index 0000000000..5ece770727 --- /dev/null +++ b/ansible-ipi-install/roles/node_prep/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for node_prep diff --git a/ansible-ipi-install/roles/node-prep/library/nmcli.py b/ansible-ipi-install/roles/node_prep/library/nmcli.py similarity index 100% rename from ansible-ipi-install/roles/node-prep/library/nmcli.py rename to ansible-ipi-install/roles/node_prep/library/nmcli.py diff --git a/ansible-ipi-install/roles/node-prep/meta/main.yml b/ansible-ipi-install/roles/node_prep/meta/main.yml similarity index 72% rename from ansible-ipi-install/roles/node-prep/meta/main.yml rename to ansible-ipi-install/roles/node_prep/meta/main.yml index cf66c6e9dd..23e9ee59ab 100644 --- a/ansible-ipi-install/roles/node-prep/meta/main.yml +++ b/ansible-ipi-install/roles/node_prep/meta/main.yml @@ -1,6 +1,6 @@ galaxy_info: author: Roger Lopez - description: The node-prep role assists in setup of the provision host. + description: The node_prep role assists in setup of the provision host. company: Red Hat, Inc. license: Apache License, Version 2.0 min_ansible_version: 2.9 diff --git a/ansible-ipi-install/roles/node-prep/tasks/10_validation.yml b/ansible-ipi-install/roles/node_prep/tasks/10_validation.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/10_validation.yml rename to ansible-ipi-install/roles/node_prep/tasks/10_validation.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/15_validation_disconnected_registry.yml b/ansible-ipi-install/roles/node_prep/tasks/15_validation_disconnected_registry.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/15_validation_disconnected_registry.yml rename to ansible-ipi-install/roles/node_prep/tasks/15_validation_disconnected_registry.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/20_sub_man_register.yml b/ansible-ipi-install/roles/node_prep/tasks/20_sub_man_register.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/20_sub_man_register.yml rename to ansible-ipi-install/roles/node_prep/tasks/20_sub_man_register.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/30_req_packages.yml b/ansible-ipi-install/roles/node_prep/tasks/30_req_packages.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/30_req_packages.yml rename to ansible-ipi-install/roles/node_prep/tasks/30_req_packages.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/40_bridge.yml b/ansible-ipi-install/roles/node_prep/tasks/40_bridge.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/40_bridge.yml rename to ansible-ipi-install/roles/node_prep/tasks/40_bridge.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/45_networking_facts.yml b/ansible-ipi-install/roles/node_prep/tasks/45_networking_facts.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/45_networking_facts.yml rename to ansible-ipi-install/roles/node_prep/tasks/45_networking_facts.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/50_modify_sudo_user.yml b/ansible-ipi-install/roles/node_prep/tasks/50_modify_sudo_user.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/50_modify_sudo_user.yml rename to ansible-ipi-install/roles/node_prep/tasks/50_modify_sudo_user.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/60_enabled_services.yml b/ansible-ipi-install/roles/node_prep/tasks/60_enabled_services.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/60_enabled_services.yml rename to ansible-ipi-install/roles/node_prep/tasks/60_enabled_services.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/70_enabled_fw_services.yml b/ansible-ipi-install/roles/node_prep/tasks/70_enabled_fw_services.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/70_enabled_fw_services.yml rename to ansible-ipi-install/roles/node_prep/tasks/70_enabled_fw_services.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/80_libvirt_pool.yml b/ansible-ipi-install/roles/node_prep/tasks/80_libvirt_pool.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/80_libvirt_pool.yml rename to ansible-ipi-install/roles/node_prep/tasks/80_libvirt_pool.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/90_create_config_install_dirs.yml b/ansible-ipi-install/roles/node_prep/tasks/90_create_config_install_dirs.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/90_create_config_install_dirs.yml rename to ansible-ipi-install/roles/node_prep/tasks/90_create_config_install_dirs.yml diff --git a/ansible-ipi-install/roles/node-prep/tasks/main.yml b/ansible-ipi-install/roles/node_prep/tasks/main.yml similarity index 100% rename from ansible-ipi-install/roles/node-prep/tasks/main.yml rename to ansible-ipi-install/roles/node_prep/tasks/main.yml diff --git a/ansible-ipi-install/roles/node-prep/templates/dir.xml.j2 b/ansible-ipi-install/roles/node_prep/templates/dir.xml.j2 similarity index 100% rename from ansible-ipi-install/roles/node-prep/templates/dir.xml.j2 rename to ansible-ipi-install/roles/node_prep/templates/dir.xml.j2 diff --git a/ansible-ipi-install/roles/node-prep/tests/inventory b/ansible-ipi-install/roles/node_prep/tests/inventory similarity index 100% rename from ansible-ipi-install/roles/node-prep/tests/inventory rename to ansible-ipi-install/roles/node_prep/tests/inventory diff --git a/ansible-ipi-install/roles/node-prep/tests/test.yml b/ansible-ipi-install/roles/node_prep/tests/test.yml similarity index 76% rename from ansible-ipi-install/roles/node-prep/tests/test.yml rename to ansible-ipi-install/roles/node_prep/tests/test.yml index 7e8a1ae09e..a7d87c057d 100644 --- a/ansible-ipi-install/roles/node-prep/tests/test.yml +++ b/ansible-ipi-install/roles/node_prep/tests/test.yml @@ -2,4 +2,4 @@ - hosts: localhost remote_user: root roles: - - node-prep + - node_prep diff --git a/ansible-ipi-install/roles/node-prep/vars/main.yml b/ansible-ipi-install/roles/node_prep/vars/main.yml similarity index 97% rename from ansible-ipi-install/roles/node-prep/vars/main.yml rename to ansible-ipi-install/roles/node_prep/vars/main.yml index 610125f9e1..06df85ae98 100644 --- a/ansible-ipi-install/roles/node-prep/vars/main.yml +++ b/ansible-ipi-install/roles/node_prep/vars/main.yml @@ -1,5 +1,5 @@ --- -# vars file for node-prep +# vars file for node_prep # the ternary states if provision host has no online access # just verify the python3-crypto, python3-pyghmi packages are present # otherwise attempt to install them from trunk.rdoproject.org diff --git a/documentation/ansible-playbook/modules/ansible-playbook-appendix-python3-crypto-pyghmi.adoc b/documentation/ansible-playbook/modules/ansible-playbook-appendix-python3-crypto-pyghmi.adoc index e278b2d199..549e979958 100644 --- a/documentation/ansible-playbook/modules/ansible-playbook-appendix-python3-crypto-pyghmi.adoc +++ b/documentation/ansible-playbook/modules/ansible-playbook-appendix-python3-crypto-pyghmi.adoc @@ -21,7 +21,7 @@ When the provision host packages are not already installed on the system, the following error can be expected ```sh -TASK [node-prep : Install required packages] ************************************************************************************************ +TASK [node_prep : Install required packages] ************************************************************************************************ Thursday 07 May 2020 19:11:35 +0000 (0:00:00.161) 0:00:11.940 ********** fatal: [provisioner.example.com]: FAILED! => {"changed": false, "failures": ["No package python3-crypto available.", "No package python3-pyghmi available."], "msg": "Failed to install some of the specified packages", "rc": 1, "results": []} ``` diff --git a/documentation/ansible-playbook/modules/ansible-playbook-dig-lookup-requires-the-python-dnspython-library.adoc b/documentation/ansible-playbook/modules/ansible-playbook-dig-lookup-requires-the-python-dnspython-library.adoc index 649ce0ba2e..86be668d48 100644 --- a/documentation/ansible-playbook/modules/ansible-playbook-dig-lookup-requires-the-python-dnspython-library.adoc +++ b/documentation/ansible-playbook/modules/ansible-playbook-dig-lookup-requires-the-python-dnspython-library.adoc @@ -2,7 +2,7 @@ = Dig lookup requires the python '`dnspython`' library and it is not installed -One of the tasks in the `node-prep` role captures your API VIP and the +One of the tasks in the `node_prep` role captures your API VIP and the Ingress VIP of your environment using a `lookup` via `dig`. It does this https://docs.ansible.com/ansible/latest/plugins/lookup/dig.html[DNS query using the `dnspython` library]. This error is a little deceiving because the `dnspython` package @@ -12,10 +12,10 @@ your local host** that is running the Ansible playbook. [source,bash] ---- -TASK [node-prep : fail] ************************************************************************************************************ +TASK [node_prep : fail] ************************************************************************************************************ skipping: [provisioner.example.com] -TASK [node-prep : Verify DNS records for API VIP, Wildcard (Ingress) VIP] ********************************************************** +TASK [node_prep : Verify DNS records for API VIP, Wildcard (Ingress) VIP] ********************************************************** fatal: [provisioner.example.com]: FAILED! => {"msg": "An unhandled exception occurred while running the lookup plugin 'dig'. Error was a , original message: The dig lookup requires the python 'dnspython' library and it is not installed"} PLAY RECAP ************************************************************************************************************************* diff --git a/documentation/ansible-playbook/modules/ansible-playbook-failed-to-install-python3-crypto-python3-pyghmi.adoc b/documentation/ansible-playbook/modules/ansible-playbook-failed-to-install-python3-crypto-python3-pyghmi.adoc index 82d0e0b088..a51191f9b0 100644 --- a/documentation/ansible-playbook/modules/ansible-playbook-failed-to-install-python3-crypto-python3-pyghmi.adoc +++ b/documentation/ansible-playbook/modules/ansible-playbook-failed-to-install-python3-crypto-python3-pyghmi.adoc @@ -23,7 +23,7 @@ can be expected [source,bash] ---- -TASK [node-prep : Install required packages] ************************************************************************************************ +TASK [node_prep : Install required packages] ************************************************************************************************ Thursday 07 May 2020 19:11:35 +0000 (0:00:00.161) 0:00:11.940 ********** fatal: [provisioner.example.com]: FAILED! => {"changed": false, "failures": ["No package python3-crypto available.", "No package python3-pyghmi available."], "msg": "Failed to install some of the specified packages", "rc": 1, "results": []} ---- diff --git a/documentation/ansible-playbook/modules/ansible-playbook-missing-python-netaddr-library.adoc b/documentation/ansible-playbook/modules/ansible-playbook-missing-python-netaddr-library.adoc index 73f4e7a7f1..8541562019 100644 --- a/documentation/ansible-playbook/modules/ansible-playbook-missing-python-netaddr-library.adoc +++ b/documentation/ansible-playbook/modules/ansible-playbook-missing-python-netaddr-library.adoc @@ -11,7 +11,7 @@ The error when running the playbook looks like the following: [source,bash] ---- -TASK [node-prep : Fail if Python modules are missing] ****************************************************************************** +TASK [node_prep : Fail if Python modules are missing] ****************************************************************************** Tuesday 05 May 2020 19:30:19 +0000 (0:00:00.512) 0:00:13.829 *********** fatal: [localhost]: FAILED! => {"changed": false, "msg": "Missing python module(s) ['netaddr'] on localhost\n"} ---- diff --git a/documentation/ansible-playbook/modules/ansible-playbook-shared-connection-closed-on-provision-host.adoc b/documentation/ansible-playbook/modules/ansible-playbook-shared-connection-closed-on-provision-host.adoc index 44d3cc0563..ac7059f943 100644 --- a/documentation/ansible-playbook/modules/ansible-playbook-shared-connection-closed-on-provision-host.adoc +++ b/documentation/ansible-playbook/modules/ansible-playbook-shared-connection-closed-on-provision-host.adoc @@ -9,7 +9,7 @@ following error. [source,bash] ---- -TASK [node-prep : Install required packages] ************************************************************************************************ +TASK [node_prep : Install required packages] ************************************************************************************************ Thursday 07 May 2020 17:04:21 +0000 (0:00:00.152) 0:00:11.854 ********** fatal: [provisioner.example.com]: FAILED! => {"changed": false, "module_stderr": "Shared connection to provisioner.example.com closed.\r\n", "module_stdout": "[Errno 101] Network is unreachable\r\n\r\n{\"msg\": \"Nothing to do\", \"changed\": false, \"results\": [], \"rc\": 0, \"invocation\": {\"module_args\": {\"name\": [\"firewalld\", \"tar\", \"libvirt\", \"qemu-kvm\", \"python3-devel\", \"jq\", \"ipmitool\", \"python3-libvirt\", \"python3-lxml\", \"python3-yaml\", \"NetworkManager-libnm\", \"nm-connection-editor\", \"libsemanage-python3\", \"policycoreutils-python3\", \"podman\"], \"state\": \"present\", \"update_cache\": true, \"allow_downgrade\": false, \"autoremove\": false, \"bugfix\": false, \"disable_gpg_check\": false, \"disable_plugin\": [], \"disablerepo\": [], \"download_only\": false, \"enable_plugin\": [], \"enablerepo\": [], \"exclude\": [], \"installroot\": \"/\", \"install_repoquery\": true, \"install_weak_deps\": true, \"security\": false, \"skip_broken\": false, \"update_only\": false, \"validate_certs\": true, \"lock_timeout\": 30, \"conf_file\": null, \"disable_excludes\": null, \"download_dir\": null, \"list\": null, \"releasever\": null}}}\r\n", "msg": "MODULE FAILURE\nSee stdout/stderr for the exact error", "rc": 0} ---- diff --git a/documentation/ansible-playbook/modules/ansible-playbook-the-ansible-playbook.adoc b/documentation/ansible-playbook/modules/ansible-playbook-the-ansible-playbook.adoc index 5bb0f953a9..c8de1137b7 100644 --- a/documentation/ansible-playbook/modules/ansible-playbook-the-ansible-playbook.adoc +++ b/documentation/ansible-playbook/modules/ansible-playbook-the-ansible-playbook.adoc @@ -4,7 +4,7 @@ The Ansible playbook connects to your provision host and -runs through the `node-prep` role and the `installer` role. +runs through the `node_prep` role and the `installer` role. No modification is necessary. All modifications of variables may be done within the `inventory/hosts` file. A sample file is located in this repository under `inventory/hosts.sample`. @@ -17,6 +17,6 @@ From the system that is to run the playbook, - name: IPI on Baremetal Installation Playbook hosts: provisioner roles: - - node-prep + - node_prep - installer ---- diff --git a/documentation/ansible-playbook/modules/ansible-playbook-tour-of-the-ansible-playbook.adoc b/documentation/ansible-playbook/modules/ansible-playbook-tour-of-the-ansible-playbook.adoc index b5dbdbfb18..2e9e4ece7b 100644 --- a/documentation/ansible-playbook/modules/ansible-playbook-tour-of-the-ansible-playbook.adoc +++ b/documentation/ansible-playbook/modules/ansible-playbook-tour-of-the-ansible-playbook.adoc @@ -5,7 +5,7 @@ * `inventory` - contains the file `hosts.sample` that: ** contains all the modifiable variables, their default values, and their definition. Some variables are empty ensuring users give an explicit value. ** the setting up of your provision node, master nodes, and worker nodes. Each section will require additional details (i.e. Management credentials). -* `roles` - contains two roles: `node-prep` and `installer`. `node-prep` handles all the prerequisites that the provisioner node requires prior to running the installer. The `installer` role handles extracting the installer, setting up the manifests, and running the Red Hat OpenShift installation. +* `roles` - contains two roles: `node_prep` and `installer`. `node_prep` handles all the prerequisites that the provisioner node requires prior to running the installer. The `installer` role handles extracting the installer, setting up the manifests, and running the Red Hat OpenShift installation. The tree structure is shown below: @@ -63,7 +63,7 @@ The tree structure is shown below: │ │ └── test.yml │ └── vars │ └── main.yml - └── node-prep + └── node_prep ├── defaults │ └── main.yml ├── handlers