From 8edbb5f7bfa63a07bfb31e2483e6bcaeb55e5b75 Mon Sep 17 00:00:00 2001 From: Rajesh Tailor Date: Tue, 30 Sep 2025 19:03:42 +0530 Subject: [PATCH] Fix typos This change fixes typos in docs, log messages and in ansible role's tasks. --- docs/source/contributing.rst | 4 ++-- docs/source/contributing_playbooks.rst | 2 +- docs/source/contributing_plugins.rst | 4 ++-- docs/source/contributing_roles.rst | 6 +++--- docs/source/playbooks/install_os.rst | 2 +- docs/source/roles/role-edpm_tripleo_cleanup.rst | 4 ++-- docs/source/testing_roles.rst | 4 ++-- docs/source/usage.rst | 10 +++++----- plugins/filter/haskey.yml | 2 +- plugins/modules/edpm_container_manage.py | 2 +- .../modules/edpm_derive_pci_passthrough_devicespec.py | 8 ++++---- roles/edpm_bootstrap/defaults/main.yml | 2 +- roles/edpm_bootstrap/facts/bootc.fact | 2 +- roles/edpm_bootstrap/meta/argument_specs.yml | 2 +- roles/edpm_ddp_package/tasks/main.yml | 2 +- roles/edpm_frr/templates/daemons.j2 | 2 +- roles/edpm_kernel/tasks/download_cache.yml | 2 +- roles/edpm_kernel/tasks/kernelargs.yml | 4 ++-- roles/edpm_libvirt/defaults/main.yml | 6 +++--- roles/edpm_libvirt/molecule/default/README.md | 2 +- roles/edpm_libvirt/molecule/default/prepare.yml | 8 ++++---- roles/edpm_libvirt/molecule/default/verify.yml | 8 ++++---- roles/edpm_libvirt/tasks/download_cache.yml | 2 +- roles/edpm_network_config/defaults/main.yml | 2 +- roles/edpm_nftables/tasks/configure.yml | 2 +- roles/edpm_nova/defaults/main.yml | 2 +- roles/edpm_nova/meta/argument_specs.yml | 4 ++-- roles/edpm_nova/molecule/default/prepare.yml | 4 ++-- roles/edpm_nova/molecule/default/verify.yml | 4 ++-- roles/edpm_ovn/defaults/main.yml | 2 +- roles/edpm_ovs/defaults/main.yml | 2 +- roles/edpm_ovs/molecule/default/verify.yml | 2 +- roles/edpm_ovs_dpdk/meta/argument_specs.yml | 2 +- .../molecule/hostname-adoption-positive/converge.yml | 2 +- .../molecule/kernel-args-existing-args/converge.yml | 2 +- .../molecule/kernel-args-no-args/converge.yml | 2 +- .../molecule/tuned-no-change/converge.yml | 2 +- roles/edpm_pre_adoption_validation/tasks/machined.yml | 2 +- roles/edpm_reboot/meta/argument_specs.yml | 6 +++--- roles/edpm_telemetry/molecule/default/verify.yml | 2 +- .../templates/openstack_network_exporter.yaml.j2 | 6 +++--- roles/edpm_telemetry_logging/meta/argument_specs.yml | 2 +- .../molecule/default/prepare.yml | 2 +- roles/edpm_tripleo_cleanup/meta/argument_specs.yml | 2 +- roles/edpm_users/meta/argument_specs.yml | 2 +- 45 files changed, 74 insertions(+), 74 deletions(-) diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst index dd34ac6ee..d8038a9ea 100644 --- a/docs/source/contributing.rst +++ b/docs/source/contributing.rst @@ -6,14 +6,14 @@ Contributors to the collection should take their time to read these guidelines, in order to avoid certain common pitfalls and needless frustration during code review. These guidelines may change, depending on evolution of the project. -However, all changes should be perfomed with consideration for other developers +However, all changes should be performed with consideration for other developers workflow and for projects using edpm-ansible collection. General recommendation ++++++++++++++++++++++ Test your code locally, if it is at all possible, to shorten the development loop -and minimize unnecessary use of CI. Before commiting your changes, run `pre-commit`_ +and minimize unnecessary use of CI. Before committing your changes, run `pre-commit`_ check to avoid needless issues with style, such as indentation. .. note:: diff --git a/docs/source/contributing_playbooks.rst b/docs/source/contributing_playbooks.rst index a640f9d63..954082261 100644 --- a/docs/source/contributing_playbooks.rst +++ b/docs/source/contributing_playbooks.rst @@ -23,7 +23,7 @@ Playbook must not duplicate other playbooks. If a newly developed playbook requires functionality not already present in existing roles, a new role should be submitted in the same PR implementing it. -If possible, playbooks should not use tasks directly, only trough a role. +If possible, playbooks should not use tasks directly, only through a role. Playbooks must use following basic layout. Exposing variables, `edpm_override_hosts`, `edpm_max_fail_percentage` and `edpm_any_errors_fatal`. diff --git a/docs/source/contributing_plugins.rst b/docs/source/contributing_plugins.rst index 02d0fbaaa..531f47b6e 100644 --- a/docs/source/contributing_plugins.rst +++ b/docs/source/contributing_plugins.rst @@ -47,7 +47,7 @@ Therefore, we will use the term **plugin** to denote the general set of auxiliar and **module** for those plugins which can be used to perform operations on the target machine. Before developing plugins first check if the use case isn't already supported by -an existing plugin in either the `ansible` or `commmunity` name space. Alternatively, it may be possible +an existing plugin in either the `ansible` or `community` name space. Alternatively, it may be possible to derive a new plugin, from an existing counterpart. However, this may cause issues with long term maintenance, as the parent plugin characteristics may change over time. @@ -96,7 +96,7 @@ Check mode ~~~~~~~~~~ Modules which do not affect the target machine must be marked as available for `check mode`_. -At the same time, a module running in check mode is resposible for not performing any +At the same time, a module running in check mode is responsible for not performing any actions that may affect the target machine. Plugin testing diff --git a/docs/source/contributing_roles.rst b/docs/source/contributing_roles.rst index 48a426fc4..1a96f052d 100644 --- a/docs/source/contributing_roles.rst +++ b/docs/source/contributing_roles.rst @@ -36,7 +36,7 @@ All roles must have an `argument specification`_ metadata, for all of their endp in the `roles//meta/argument_specs.yml` file. Argument specs allow for validity checks on arguments passed to the role in playbooks, -while also providing bulk of the information neccessary for automated doc build. +while also providing bulk of the information necessary for automated doc build. This both prevents unnecessary bugs, and simplifies documentation upkeep. Argument specification must contain definition of argument types, defaults and descriptions. @@ -119,7 +119,7 @@ Tasks All tasks of the role must accurately report whether or not they have performed changes on the target machine. This is especially important when tasks invoke -modules which do not properly implement change reporting, for example `ansible.buildin.cmd`. +modules which do not properly implement change reporting, for example `ansible.builtin.cmd`. In these cases, `changed_when`_ and `failed_when`_ constructs must be used. Just like other `conditionals`_, the conditionals used to define change and failure should @@ -144,7 +144,7 @@ like dictionaries or lists, in order to strain on human parser. Privilege escalation ++++++++++++++++++++ -`Privilege escalation`_, or `become`, must be used only when neccessary. +`Privilege escalation`_, or `become`, must be used only when necessary. Only tasks that have to be executed under root privileges should receive them. Even if there are multiple tasks requiring root privileges, separated by others that can operate under normal user, the entire role must not operate under them. diff --git a/docs/source/playbooks/install_os.rst b/docs/source/playbooks/install_os.rst index db7174fd3..cdd40b5c6 100644 --- a/docs/source/playbooks/install_os.rst +++ b/docs/source/playbooks/install_os.rst @@ -9,7 +9,7 @@ Uses external `timesync` role from `system roles collection`_ to both install an Time service configuration -------------------------- -Variables of the `timesync`_ system role can be overriden in a standard ansible way, +Variables of the `timesync`_ system role can be overridden in a standard ansible way, while respecting resolution order. Default values are set in the `install_os` playbook, while allowing for override. diff --git a/docs/source/roles/role-edpm_tripleo_cleanup.rst b/docs/source/roles/role-edpm_tripleo_cleanup.rst index 265f652af..6509ef6b4 100644 --- a/docs/source/roles/role-edpm_tripleo_cleanup.rst +++ b/docs/source/roles/role-edpm_tripleo_cleanup.rst @@ -3,10 +3,10 @@ Role - edpm_tripleo_cleanup ================================ Role stops and disables all systemd units enumerated to it. -If the role doesn't recieve list of services, it will instead stop and disable +If the role doesn't receive list of services, it will instead stop and disable all units containing string "tripleo" in their name. -This way we can effectivelly prevent any leftovers of original tripleo based +This way we can effectively prevent any leftovers of original tripleo based deployment from interfering with post-adoption setup. .. include:: diff --git a/docs/source/testing_roles.rst b/docs/source/testing_roles.rst index 229299ff1..09ef31aac 100644 --- a/docs/source/testing_roles.rst +++ b/docs/source/testing_roles.rst @@ -40,7 +40,7 @@ Creating a VM to run molecule The `edpm_libvirt `_ -molecule senario uses the delegated driver to run against localhost. +molecule scenario uses the delegated driver to run against localhost. Thus, it's better to run it inside an ephemeral virtual machine as it cannot be run insider of a container. @@ -94,7 +94,7 @@ following. Writing molecule tests ~~~~~~~~~~~~~~~~~~~~~~ -Molecule scenario configutration is made up of several files, all +Molecule scenario configuration is made up of several files, all stored in the `molecule//` directory. * `molecule/default/molecule.yml` (mandatory): diff --git a/docs/source/usage.rst b/docs/source/usage.rst index 482e586af..67ab381bd 100644 --- a/docs/source/usage.rst +++ b/docs/source/usage.rst @@ -12,20 +12,20 @@ Using roles in playbooks ++++++++++++++++++++++++ Plabyooks should import roles whole, not only import specific subset of tasks. -Situations when this is neccessary indicate inappropriate problem decomposition +Situations when this is necessary indicate inappropriate problem decomposition and could point towards need for refactoring. -Roles must be invoked using their FQN, in order to preven potential collisions +Roles must be invoked using their FQN, in order to prevent potential collisions and to clarify collection dependencies. Only variables that don't have appropriate defaults should be set explicitly -in the role invokation. The notable exception being repeated use of the same +in the role invocation. The notable exception being repeated use of the same role within the playbook, when it may be more beneficial, from the maintenance perspective, to explicitly set other variables. -The role invokation in a playbook is analogous to call of function in other languages. +The role invocation in a playbook is analogous to call of function in other languages. However, output of one role shouldn't impact operations of other roles, not including -cases when role exectuion fails. +cases when role execution fails. Roles must not be imported using the plain `include`_ module, as it has been deprecated. Instead the `roles`_ keyword should be used on the playbook level when possible. diff --git a/plugins/filter/haskey.yml b/plugins/filter/haskey.yml index cfcc64351..8020e5c0b 100644 --- a/plugins/filter/haskey.yml +++ b/plugins/filter/haskey.yml @@ -4,7 +4,7 @@ DOCUMENTATION: name: haskey author: "EDPM team" version_added: 2.9 - short_description: Retrun dictionaries with given key + short_description: Return dictionaries with given key description: | This filter will take a list of dictionaries (data) and will return the dictionaries which have a certain key given diff --git a/plugins/modules/edpm_container_manage.py b/plugins/modules/edpm_container_manage.py index 687572ff2..0480de35e 100644 --- a/plugins/modules/edpm_container_manage.py +++ b/plugins/modules/edpm_container_manage.py @@ -317,7 +317,7 @@ def manage_container(self, name, config): if 'remove' in opts: opts['rm'] = opts.pop('remove') if 'restart' in opts: - # NOTE(mwhahaha): converation from edpm format to podman as + # NOTE(mwhahaha): conversion from edpm format to podman as # systemd handles this restart config opts['restart'] = False opts['state'] = 'created' diff --git a/plugins/modules/edpm_derive_pci_passthrough_devicespec.py b/plugins/modules/edpm_derive_pci_passthrough_devicespec.py index c7f56828a..2275b59d2 100644 --- a/plugins/modules/edpm_derive_pci_passthrough_devicespec.py +++ b/plugins/modules/edpm_derive_pci_passthrough_devicespec.py @@ -51,7 +51,7 @@ required: true sriov_phydev_map: description: - - Comma seperated SR-IOV <-> phydev mappings + - Comma separated SR-IOV <-> phydev mappings type: str required: false default: '' @@ -114,9 +114,9 @@ def get_pci_field_val(prop, maxval, hex_value): try: v = int(prop, 16) except ValueError: - raise InvalidConfigException('Invalid PCI address specififed {!r}'.format(prop)) + raise InvalidConfigException('Invalid PCI address specified {!r}'.format(prop)) if v > maxval: - raise InvalidConfigException('PCI address specififed {!r} is out of range'.format(prop)) + raise InvalidConfigException('PCI address specified {!r} is out of range'.format(prop)) return hex_value % v @@ -133,7 +133,7 @@ def get_pciaddr_dict_from_usraddr(pci_addr): if dbs: dbs_fields = dbs.split(':') if len(dbs_fields) > 3: - raise InvalidConfigException('Invalid PCI address specififed {!r}'.format(pci_addr)) + raise InvalidConfigException('Invalid PCI address specified {!r}'.format(pci_addr)) # If we got a partial address like ":00.", we need to turn this # into a domain of ANY, a bus of ANY, and a slot of 00. This code # allows the address,bus and/or domain to be left off diff --git a/roles/edpm_bootstrap/defaults/main.yml b/roles/edpm_bootstrap/defaults/main.yml index c43071ea1..303c71682 100644 --- a/roles/edpm_bootstrap/defaults/main.yml +++ b/roles/edpm_bootstrap/defaults/main.yml @@ -24,7 +24,7 @@ edpm_bootstrap_download_delay: "{{ edpm_download_delay | default(60) }}" # number of retries for download tasks edpm_bootstrap_download_retries: "{{ edpm_download_retries | default(5) }}" -# List of packages that are requred to bootstrap EDPM. +# List of packages that are required to bootstrap EDPM. edpm_bootstrap_packages_bootstrap: - driverctl - lvm2 diff --git a/roles/edpm_bootstrap/facts/bootc.fact b/roles/edpm_bootstrap/facts/bootc.fact index 0e1b0cde5..9385513fa 100755 --- a/roles/edpm_bootstrap/facts/bootc.fact +++ b/roles/edpm_bootstrap/facts/bootc.fact @@ -4,7 +4,7 @@ BOOTC_SYSTEM="false" BOOTC_PACKAGE=$(rpm -qa | grep bootc) # If the system isn't using bootc, we can exit early here since the -# RPM wont be installed. +# RPM won't be installed. if [[ $BOOTC_PACKAGE == "" ]]; then echo ${BOOTC_SYSTEM} exit diff --git a/roles/edpm_bootstrap/meta/argument_specs.yml b/roles/edpm_bootstrap/meta/argument_specs.yml index f7a2a9311..d697b36cd 100644 --- a/roles/edpm_bootstrap/meta/argument_specs.yml +++ b/roles/edpm_bootstrap/meta/argument_specs.yml @@ -31,7 +31,7 @@ argument_specs: - systemd-container - crypto-policies-scripts - grubby - description: "List of packages that are requred to bootstrap EDPM." + description: "List of packages that are required to bootstrap EDPM." edpm_bootstrap_release_version_package: type: list diff --git a/roles/edpm_ddp_package/tasks/main.yml b/roles/edpm_ddp_package/tasks/main.yml index 096b98550..609e576ca 100644 --- a/roles/edpm_ddp_package/tasks/main.yml +++ b/roles/edpm_ddp_package/tasks/main.yml @@ -78,7 +78,7 @@ package_filename: "ice.pkg.xz" when: ice_pkg_xz.stat.exists - - name: Confiure ddp/ice.pkg + - name: Configure ddp/ice.pkg ansible.builtin.file: src: '{{ ddp_last_package_file }}' dest: "{{ edpm_ddp_package_path }}/ddp/{{ package_filename }}" diff --git a/roles/edpm_frr/templates/daemons.j2 b/roles/edpm_frr/templates/daemons.j2 index 99dc64d61..e72247c3e 100644 --- a/roles/edpm_frr/templates/daemons.j2 +++ b/roles/edpm_frr/templates/daemons.j2 @@ -48,7 +48,7 @@ fabricd_options=("-A 127.0.0.1") # If the vtysh_enable is yes, then the unified config is read # and applied if it exists. If no unified frr.conf exists # then the per-daemon .conf files are used) -# If vtysh_enable is no or non-existant, the frr.conf is ignored. +# If vtysh_enable is no or non-existent, the frr.conf is ignored. # it is highly suggested to have this set to yes vtysh_enable=yes diff --git a/roles/edpm_kernel/tasks/download_cache.yml b/roles/edpm_kernel/tasks/download_cache.yml index 8b0462d62..dbc8afa9e 100644 --- a/roles/edpm_kernel/tasks/download_cache.yml +++ b/roles/edpm_kernel/tasks/download_cache.yml @@ -1,6 +1,6 @@ --- -- name: Install addditional packages +- name: Install additional packages ansible.builtin.dnf: name: "{{ edpm_kernel_extra_packages }}" download_only: true diff --git a/roles/edpm_kernel/tasks/kernelargs.yml b/roles/edpm_kernel/tasks/kernelargs.yml index e0955cb55..2b3ebc509 100644 --- a/roles/edpm_kernel/tasks/kernelargs.yml +++ b/roles/edpm_kernel/tasks/kernelargs.yml @@ -49,7 +49,7 @@ - name: Warn operator about workload protection ansible.builtin.debug: msg: | - Automated reboot for this node has been defered because it is already provisionned. + Automated reboot for this node has been deferred because it is already provisionned. Please schedule a manual reboot after this deployment is completed. - name: Setting workload protection fact @@ -93,7 +93,7 @@ # Leapp does not recognise grub entries starting other than GRUB # It results wrong formatting of entries in file /etc/default/grub # In order to fix it for FFU (queens to train), EDPM_KERNEL_ARGS has been renamed - # Ensure the fresh deployment is also alinged with the same name + # Ensure the fresh deployment is also aligned with the same name - name: Delete older name EDPM_KERNEL_ARGS entries if present ansible.builtin.lineinfile: dest: /etc/default/grub diff --git a/roles/edpm_libvirt/defaults/main.yml b/roles/edpm_libvirt/defaults/main.yml index adedb2625..2beb63069 100644 --- a/roles/edpm_libvirt/defaults/main.yml +++ b/roles/edpm_libvirt/defaults/main.yml @@ -25,7 +25,7 @@ edpm_libvirt_service_name: libvirt edpm_libvirt_download_delay: "{{ edpm_download_delay | default(60) }}" # number of retries for download tasks edpm_libvirt_download_retries: "{{ edpm_download_retries | default(5) }}" -# this sould map to the libvirt +# this should map to the libvirt edpm_libvirt_services: - virtlogd - virtnodedevd @@ -33,7 +33,7 @@ edpm_libvirt_services: - virtqemud - virtsecretd # List of services to stop during adoption -# (container nova_virtlod is handled separetly) +# (container nova_virtlod is handled separately) edpm_libvirt_old_tripleo_compute_sevices: - tripleo_nova_libvirt.target - tripleo_nova_virtlogd_wrapper.service @@ -50,7 +50,7 @@ edpm_libvirt_packages: - libvirt-admin {{ edpm_libvirt_range }} - libvirt-client {{ edpm_libvirt_range }} - libvirt-daemon {{ edpm_libvirt_range }} - # qemu pakcages + # qemu packages - qemu-kvm - qemu-img # libguestfs is need for config drive and ephermeral disks diff --git a/roles/edpm_libvirt/molecule/default/README.md b/roles/edpm_libvirt/molecule/default/README.md index 26c76aca4..1c00a2c53 100644 --- a/roles/edpm_libvirt/molecule/default/README.md +++ b/roles/edpm_libvirt/molecule/default/README.md @@ -2,7 +2,7 @@ edpm_libvirt ************ -The edpm_libvirt default molecule senario uses +The edpm_libvirt default molecule scenario uses the delegated driver to run against localhost. As such this should only be executed on a disposable host. diff --git a/roles/edpm_libvirt/molecule/default/prepare.yml b/roles/edpm_libvirt/molecule/default/prepare.yml index e24383fdf..9484bd6af 100644 --- a/roles/edpm_libvirt/molecule/default/prepare.yml +++ b/roles/edpm_libvirt/molecule/default/prepare.yml @@ -55,7 +55,7 @@ name: "{{ item }}" state: present loop: - # NOTE(gibi): this is done by the boostrap role in a real deployment + # NOTE(gibi): this is done by the bootstrap role in a real deployment - openstack-selinux # NOTE(sean-k-mooney): this is needed to generate certs for tls testing - python3-cryptography @@ -216,8 +216,8 @@ content: "correct horse battery staple" # FIXME(sean-k-mooney): this is a hack to work around # the fact that the playbook uses a lookup plugin which always - # executes on the ansible contoller. This is needed to ensure - # the password is available locally when runing under vagrant. + # executes on the ansible controller. This is needed to ensure + # the password is available locally when running under vagrant. delegate_to: localhost - name: Gather required facts @@ -229,7 +229,7 @@ - "system" # FIXME(sean-k-mooney): this is a hack to work around the fact that we dont - # currently manage the hostname on the DUT via boostrap or a dedicated role + # currently manage the hostname on the DUT via bootstrap or a dedicated role # in the molecule test. This is needed to ensure the hostname is resolvable # when executing virsh commands. remove this when we have a proper solution - name: Ensure hostname is resolvable in /etc/hosts diff --git a/roles/edpm_libvirt/molecule/default/verify.yml b/roles/edpm_libvirt/molecule/default/verify.yml index 50b1c253d..963f17cd4 100644 --- a/roles/edpm_libvirt/molecule/default/verify.yml +++ b/roles/edpm_libvirt/molecule/default/verify.yml @@ -21,7 +21,7 @@ # common directories - "/etc/tmpfiles.d/" - "/var/lib/openstack" - # extrenal deps + # external deps - "/var/lib/openstack/config/ceph" # libvirt directories - "/var/lib/libvirt" @@ -31,7 +31,7 @@ - name: ensure systemd services are defined and functional ansible.builtin.include_tasks: "{{test_helper_dir}}/verify_systemd_unit.yaml" loop: - # rhel installed services have service units defiend via rpm in + # rhel installed services have service units defined via rpm in # /usr/lib/systemd/system so disable the check for them them in # /etc/systemd/system - { "name": "virtlogd.service", "osp_service": false, "enabled": "enabled" } @@ -117,11 +117,11 @@ - {"path": "/run/libvirt/virtsecretd-sock", "user": "root", "group": "libvirt" } - {"path": "/run/libvirt/virtsecretd-sock-ro", "user": "root", "group": "libvirt" } - - name: ensure container_file_t selinux lable is not set on /run/libvirt + - name: ensure container_file_t selinux label is not set on /run/libvirt ansible.builtin.shell: "ls -lZ /run/libvirt | grep container_file_t" register: run_libvirt failed_when: run_libvirt.rc not in [0, 1] - - name: Assert that container_file_t selinux lable is not set on /run/libvirt + - name: Assert that container_file_t selinux label is not set on /run/libvirt ansible.builtin.assert: that: - "run_libvirt.rc != 0" diff --git a/roles/edpm_libvirt/tasks/download_cache.yml b/roles/edpm_libvirt/tasks/download_cache.yml index c09978359..43e66ef89 100644 --- a/roles/edpm_libvirt/tasks/download_cache.yml +++ b/roles/edpm_libvirt/tasks/download_cache.yml @@ -1,5 +1,5 @@ --- -- name: Install addditional packages +- name: Install additional packages ansible.builtin.dnf: name: "{{ edpm_libvirt_packages }}" download_only: true diff --git a/roles/edpm_network_config/defaults/main.yml b/roles/edpm_network_config/defaults/main.yml index d9fd99b06..99650df5f 100644 --- a/roles/edpm_network_config/defaults/main.yml +++ b/roles/edpm_network_config/defaults/main.yml @@ -61,5 +61,5 @@ edpm_dns_search_domains: [] edpm_network_config_nonconfigured_cleanup: true # Control resolv.conf management by NetworkManager # false = disable NetworkManager resolv.conf update (default) -# true = enable NetworkManager resolv.conf updat +# true = enable NetworkManager resolv.conf update edpm_bootstrap_network_resolvconf_update: "{{ edpm_network_config_nmstate | default(True) }}" diff --git a/roles/edpm_nftables/tasks/configure.yml b/roles/edpm_nftables/tasks/configure.yml index f90469a21..0b6a68507 100644 --- a/roles/edpm_nftables/tasks/configure.yml +++ b/roles/edpm_nftables/tasks/configure.yml @@ -25,7 +25,7 @@ group: root mode: "0750" - - name: Push default ruleset snipet + - name: Push default ruleset snippet ansible.builtin.template: dest: "{{ edpm_nftables_src }}/edpm-nftables-base.yaml" src: base-rules.yaml.j2 diff --git a/roles/edpm_nova/defaults/main.yml b/roles/edpm_nova/defaults/main.yml index 3590ab577..eba79ee46 100644 --- a/roles/edpm_nova/defaults/main.yml +++ b/roles/edpm_nova/defaults/main.yml @@ -54,7 +54,7 @@ edpm_nova_old_tripleo_compute_sevices: - tripleo_nova_scheduler.service - tripleo_nova_vnc_proxy.service -# a list of addtional host mounts +# a list of additional host mounts edpm_nova_extra_bind_mounts: [] # NVMe cleaner config diff --git a/roles/edpm_nova/meta/argument_specs.yml b/roles/edpm_nova/meta/argument_specs.yml index 1e2b8e540..12932ae33 100644 --- a/roles/edpm_nova/meta/argument_specs.yml +++ b/roles/edpm_nova/meta/argument_specs.yml @@ -39,7 +39,7 @@ argument_specs: description: | The container image to use for the nova compute container. This image is used to create the nova compute container - on the compute node and generaly will be set via the container + on the compute node and generally will be set via the container bundle by the dataplane operator. edpm_nova_old_tripleo_compute_sevices: type: list @@ -59,7 +59,7 @@ argument_specs: default: [] description: | A list of additional host mounts to be added to the nova compute container - This enabled vendor integration to pass addtional data files to the nova compute + This enabled vendor integration to pass additional data files to the nova compute container. The list should be in the form of a list of dictionaries with the following keys: - src: The path to the file or directory on the host diff --git a/roles/edpm_nova/molecule/default/prepare.yml b/roles/edpm_nova/molecule/default/prepare.yml index 2fcd7fb71..0d87571f1 100644 --- a/roles/edpm_nova/molecule/default/prepare.yml +++ b/roles/edpm_nova/molecule/default/prepare.yml @@ -49,7 +49,7 @@ ./venv/bin/repo-setup -d centos9 current-podified -b antelope popd rm -rf repo-setup-main - # NOTE(gibi): this is done by the boostrap role in a real deployment + # NOTE(gibi): this is done by the bootstrap role in a real deployment - name: Install openstack-selinux become: true ansible.builtin.dnf: @@ -158,7 +158,7 @@ - "system" # FIXME(sean-k-mooney): this is a hack to work around the fact that we dont - # currently manage the hostname on the DUT via boostrap or a dedicated role + # currently manage the hostname on the DUT via bootstrap or a dedicated role # in the molecule test. This is needed to ensure the hostname is resolvable # when executing virsh commands. remove this when we have a proper solution - name: Ensure hostname is resolvable in /etc/hosts diff --git a/roles/edpm_nova/molecule/default/verify.yml b/roles/edpm_nova/molecule/default/verify.yml index a152be738..f36f41eb9 100644 --- a/roles/edpm_nova/molecule/default/verify.yml +++ b/roles/edpm_nova/molecule/default/verify.yml @@ -17,14 +17,14 @@ - "/var/lib/openstack" - "/var/lib/openstack/config/containers" - "/etc/ssh/ssh_known_hosts" - # extrenal deps + # external deps - "/var/lib/openstack/config/ceph" # nova directories - "/var/lib/nova" - "/var/lib/openstack/config/nova" - "/var/lib/_nova_secontext" - "/var/lib/nova/instances" - # NOTE(sean-k-mooney): this directory is normaly created by the edpm_install_cert role + # NOTE(sean-k-mooney): this directory is normally created by the edpm_install_cert role # in molecule we create it in prepare so lets just assert it exists - "{{ edpm_nova_tls_ca_src_dir }}" diff --git a/roles/edpm_ovn/defaults/main.yml b/roles/edpm_ovn/defaults/main.yml index c0ded5f79..683fe4b1e 100644 --- a/roles/edpm_ovn/defaults/main.yml +++ b/roles/edpm_ovn/defaults/main.yml @@ -16,7 +16,7 @@ edpm_ovn_bridge_mappings: ["datacentre:br-ex"] # Local unicast prefix edpm_ovn_chassis_mac_first_octets: ["0e", "1e", "2e", "3e"] -# Automatically generate the first two octets for the MAC address pefixes. +# Automatically generate the first two octets for the MAC address prefixes. # Pick random from first octets and then a nested iteration over a range # of seeds. # The inner loop breaks as soon as the bridge_mapping is in seen_bridges. diff --git a/roles/edpm_ovs/defaults/main.yml b/roles/edpm_ovs/defaults/main.yml index 961a7e8bb..d1fff8591 100644 --- a/roles/edpm_ovs/defaults/main.yml +++ b/roles/edpm_ovs/defaults/main.yml @@ -23,7 +23,7 @@ edpm_ovs_download_delay: "{{ edpm_download_delay | default(60) }}" # number of retries for download tasks edpm_ovs_download_retries: "{{ edpm_download_retries | default(5) }}" -# this sould map to the ovs +# this should map to the ovs edpm_ovs_services: - openvswitch edpm_ovs_packages: diff --git a/roles/edpm_ovs/molecule/default/verify.yml b/roles/edpm_ovs/molecule/default/verify.yml index 7d72e8ff4..b0288dd50 100644 --- a/roles/edpm_ovs/molecule/default/verify.yml +++ b/roles/edpm_ovs/molecule/default/verify.yml @@ -16,7 +16,7 @@ - name: ensure systemd services are defined and functional ansible.builtin.include_tasks: "{{test_helper_dir}}/verify_systemd_unit.yaml" loop: - # rhel installed services have service units defiend via rpm in + # rhel installed services have service units defined via rpm in # /usr/lib/systemd/system so disable the check for them them in # /etc/systemd/system - { "name": "openvswitch.service", "osp_service": false, "enabled": "enabled" } diff --git a/roles/edpm_ovs_dpdk/meta/argument_specs.yml b/roles/edpm_ovs_dpdk/meta/argument_specs.yml index 2afab5ab2..5d71cf36f 100644 --- a/roles/edpm_ovs_dpdk/meta/argument_specs.yml +++ b/roles/edpm_ovs_dpdk/meta/argument_specs.yml @@ -31,7 +31,7 @@ argument_specs: edpm_ovs_dpdk_emc_insertion_probablity: type: str default: "" - description: OvS DPDK EMAC insertion probablity + description: OvS DPDK EMAC insertion probability edpm_ovs_dpdk_enable_tso: type: bool default: false diff --git a/roles/edpm_pre_adoption_validation/molecule/hostname-adoption-positive/converge.yml b/roles/edpm_pre_adoption_validation/molecule/hostname-adoption-positive/converge.yml index 861484070..8b103dec3 100644 --- a/roles/edpm_pre_adoption_validation/molecule/hostname-adoption-positive/converge.yml +++ b/roles/edpm_pre_adoption_validation/molecule/hostname-adoption-positive/converge.yml @@ -9,6 +9,6 @@ ansible.builtin.include_role: name: osp.edpm.edpm_pre_adoption_validation rescue: - - name: Assert that the validaton passed + - name: Assert that the validation passed ansible.builtin.fail: msg: "validation should pass as the old and new configs are matching" diff --git a/roles/edpm_pre_adoption_validation/molecule/kernel-args-existing-args/converge.yml b/roles/edpm_pre_adoption_validation/molecule/kernel-args-existing-args/converge.yml index 861484070..8b103dec3 100644 --- a/roles/edpm_pre_adoption_validation/molecule/kernel-args-existing-args/converge.yml +++ b/roles/edpm_pre_adoption_validation/molecule/kernel-args-existing-args/converge.yml @@ -9,6 +9,6 @@ ansible.builtin.include_role: name: osp.edpm.edpm_pre_adoption_validation rescue: - - name: Assert that the validaton passed + - name: Assert that the validation passed ansible.builtin.fail: msg: "validation should pass as the old and new configs are matching" diff --git a/roles/edpm_pre_adoption_validation/molecule/kernel-args-no-args/converge.yml b/roles/edpm_pre_adoption_validation/molecule/kernel-args-no-args/converge.yml index 861484070..8b103dec3 100644 --- a/roles/edpm_pre_adoption_validation/molecule/kernel-args-no-args/converge.yml +++ b/roles/edpm_pre_adoption_validation/molecule/kernel-args-no-args/converge.yml @@ -9,6 +9,6 @@ ansible.builtin.include_role: name: osp.edpm.edpm_pre_adoption_validation rescue: - - name: Assert that the validaton passed + - name: Assert that the validation passed ansible.builtin.fail: msg: "validation should pass as the old and new configs are matching" diff --git a/roles/edpm_pre_adoption_validation/molecule/tuned-no-change/converge.yml b/roles/edpm_pre_adoption_validation/molecule/tuned-no-change/converge.yml index 861484070..8b103dec3 100644 --- a/roles/edpm_pre_adoption_validation/molecule/tuned-no-change/converge.yml +++ b/roles/edpm_pre_adoption_validation/molecule/tuned-no-change/converge.yml @@ -9,6 +9,6 @@ ansible.builtin.include_role: name: osp.edpm.edpm_pre_adoption_validation rescue: - - name: Assert that the validaton passed + - name: Assert that the validation passed ansible.builtin.fail: msg: "validation should pass as the old and new configs are matching" diff --git a/roles/edpm_pre_adoption_validation/tasks/machined.yml b/roles/edpm_pre_adoption_validation/tasks/machined.yml index ecec6b9ad..778b8f0df 100644 --- a/roles/edpm_pre_adoption_validation/tasks/machined.yml +++ b/roles/edpm_pre_adoption_validation/tasks/machined.yml @@ -35,5 +35,5 @@ You must have the systemd-container package installed. Do not install it manually as that stops VM instances. Complete a minor update of the source cloud and reboot - your Nova Compute hypervisors ony by one. To reboot + your Nova Compute hypervisors one by one. To reboot a hypervisor, firstly live-migrate its VM instances. diff --git a/roles/edpm_reboot/meta/argument_specs.yml b/roles/edpm_reboot/meta/argument_specs.yml index fa4a2418e..33527c390 100644 --- a/roles/edpm_reboot/meta/argument_specs.yml +++ b/roles/edpm_reboot/meta/argument_specs.yml @@ -6,9 +6,9 @@ argument_specs: options: edpm_reboot_strategy: description: | - Default strategy is auto. In auto mode reboot for deployed nodes is by default defered as it can - impact running vms or openstack services. Only on initial run when nova related files are not yet created reboot is not defered. - When edpm_reboot_force_reboot is set to force, reboot is allowed and will be perfomed always. + Default strategy is auto. In auto mode reboot for deployed nodes is by default deferred as it can + impact running vms or openstack services. Only on initial run when nova related files are not yet created reboot is not deferred. + When edpm_reboot_force_reboot is set to force, reboot is allowed and will be performed always. type: str default: auto edpm_reboot_old_tripleo_node_config_dir: diff --git a/roles/edpm_telemetry/molecule/default/verify.yml b/roles/edpm_telemetry/molecule/default/verify.yml index 7275ba06b..260f65425 100644 --- a/roles/edpm_telemetry/molecule/default/verify.yml +++ b/roles/edpm_telemetry/molecule/default/verify.yml @@ -37,7 +37,7 @@ - "/usr/bin/ceilometer-polling --polling-namespaces compute --logfile /dev/stdout" - "Copying /var/lib/openstack/config/ceilometer-host-specific.conf to /etc/ceilometer/ceilometer.conf.d/02-ceilometer-host-specific.conf" - - name: ensure that the correcty binary started with TLS + - name: ensure that the correct binary started with TLS become: true ansible.builtin.shell: | podman logs node_exporter 2>&1 | grep "{{item}}" > /dev/null diff --git a/roles/edpm_telemetry/templates/openstack_network_exporter.yaml.j2 b/roles/edpm_telemetry/templates/openstack_network_exporter.yaml.j2 index 8644c3ed5..0060a0e53 100644 --- a/roles/edpm_telemetry/templates/openstack_network_exporter.yaml.j2 +++ b/roles/edpm_telemetry/templates/openstack_network_exporter.yaml.j2 @@ -6,13 +6,13 @@ # at /etc/openstack-network-exporter.yaml by default. The path can be changed via # the OPENSTACK_NETWORK_EXPORTER_YAML environment variable. # -# All settings have default values and some of them can be overriden via +# All settings have default values and some of them can be overridden via # environment variables as indicated in their description. --- -# Local addess and port to listen to for scraping HTTP requests. Can be +# Local address and port to listen to for scraping HTTP requests. Can be # "127.0.0.1:" or "[::1]:" to limit to localhost. If address is -# omited, listen on all addresses. +# omitted, listen on all addresses. # # Env: OPENSTACK_NETWORK_EXPORTER_HTTP_LISTEN # Default: ":1981" diff --git a/roles/edpm_telemetry_logging/meta/argument_specs.yml b/roles/edpm_telemetry_logging/meta/argument_specs.yml index 490cb4913..aebba5e29 100644 --- a/roles/edpm_telemetry_logging/meta/argument_specs.yml +++ b/roles/edpm_telemetry_logging/meta/argument_specs.yml @@ -22,7 +22,7 @@ argument_specs: edpm_telemetry_logging_config_src: type: "str" required: true - description: "The path in the ansibleEE contaner where the logging config files are stored" + description: "The path in the ansibleEE container where the logging config files are stored" edpm_telemetry_rsyslog_config_dest: type: "str" required: true diff --git a/roles/edpm_telemetry_power_monitoring/molecule/default/prepare.yml b/roles/edpm_telemetry_power_monitoring/molecule/default/prepare.yml index 4ad12e911..38e8ce424 100644 --- a/roles/edpm_telemetry_power_monitoring/molecule/default/prepare.yml +++ b/roles/edpm_telemetry_power_monitoring/molecule/default/prepare.yml @@ -42,7 +42,7 @@ popd rm -rf repo-setup-main - # NOTE(gibi): this is done by the boostrap role in a real deployment + # NOTE(gibi): this is done by the bootstrap role in a real deployment - name: Install openstack-selinux become: true ansible.builtin.dnf: diff --git a/roles/edpm_tripleo_cleanup/meta/argument_specs.yml b/roles/edpm_tripleo_cleanup/meta/argument_specs.yml index 6baa380f9..4ea34613e 100644 --- a/roles/edpm_tripleo_cleanup/meta/argument_specs.yml +++ b/roles/edpm_tripleo_cleanup/meta/argument_specs.yml @@ -37,7 +37,7 @@ argument_specs: type: "list" description: | List of services to be kept during cleanup. - By default these are services related to Swift storag. + By default these are services related to Swift storage. default: - tripleo_swift_account_auditor - tripleo_swift_account_reaper diff --git a/roles/edpm_users/meta/argument_specs.yml b/roles/edpm_users/meta/argument_specs.yml index f5f9dbfe2..99d2a155a 100644 --- a/roles/edpm_users/meta/argument_specs.yml +++ b/roles/edpm_users/meta/argument_specs.yml @@ -27,6 +27,6 @@ argument_specs: - {"path": "/var/lib/vhost_sockets", "owner": "qemu", "group": "qemu", "setype": "virt_cache_t", "seuser": "system_u", "mode": "0755"} description: | The list of directories to create on the compute node for communication with host processes. - This shoudl only be used for directories that are required to be shared between containers and host processes. + This should only be used for directories that are required to be shared between containers and host processes. Where the host directories are created solely for the purpose of sharing content between containers or to persist data this should not be used.