diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 0344e83feb..5d856227ae 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1471,7 +1471,7 @@ function configure_ironic_provision_network { # Set provision network GW on physical interface # Add vlan on br interface in case of IRONIC_PROVISION_PROVIDER_NETWORK_TYPE==vlan - # othervise assign ip to br interface directly. + # otherwise assign ip to br interface directly. sudo ip link set dev $OVS_PHYSICAL_BRIDGE up if [[ "$IRONIC_IP_VERSION" == "4" ]]; then if [[ "$IRONIC_PROVISION_PROVIDER_NETWORK_TYPE" == "vlan" ]]; then @@ -2669,7 +2669,7 @@ function enroll_nodes { fi # In case we using portgroups, we should API version that support them. - # Othervise API will return 406 ERROR + # Otherwise API will return 406 ERROR # NOTE(vsaienko) interface_info is in the following format here: # mac1,tap-node0i1;mac2,tap-node0i2;...;macN,tap-node0iN for info in ${interface_info//;/ }; do diff --git a/ironic/api/controllers/v1/allocation.py b/ironic/api/controllers/v1/allocation.py index efe26bb96d..7a3e3ff514 100644 --- a/ironic/api/controllers/v1/allocation.py +++ b/ironic/api/controllers/v1/allocation.py @@ -328,7 +328,7 @@ class AllocationsController(pecan.rest.RestController): # that if the scope enforcement is not enabled, that # any user can't create an allocation until the deployment # is in a new operating mode *where* owner will be added - # automatically if not a privilged user. + # automatically if not a privileged user. except exception.HTTPForbidden: cdict = api.request.context.to_policy_values() project = cdict.get('project_id') diff --git a/ironic/common/pxe_utils.py b/ironic/common/pxe_utils.py index 2bba1bb84a..1c1a2915d1 100644 --- a/ironic/common/pxe_utils.py +++ b/ironic/common/pxe_utils.py @@ -428,7 +428,7 @@ def clean_up_pxe_config(task, ipxe_enabled=False): ironic_utils.unlink_without_raise( _get_pxe_mac_path(port.address, client_id=client_id, ipxe_enabled=ipxe_enabled)) - # Grub2 MAC address based confiuration + # Grub2 MAC address based configuration for path in _get_pxe_grub_mac_path(port.address, ipxe_enabled=ipxe_enabled): ironic_utils.unlink_without_raise(path) diff --git a/ironic/conf/anaconda.py b/ironic/conf/anaconda.py index b77218f9dd..f478e49fef 100644 --- a/ironic/conf/anaconda.py +++ b/ironic/conf/anaconda.py @@ -32,7 +32,7 @@ opts = [ default=False, mutable=True, help=_('Option to allow the kickstart configuration to be ' - 'informed if SSL/TLS certificate verificaiton should ' + 'informed if SSL/TLS certificate verification should ' 'be enforced, or not. This option exists largely to ' 'facilitate easy testing and use of the ``anaconda`` ' 'deployment interface. When this option is set, ' diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index f2553b88a6..e5259f7bcd 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -206,7 +206,7 @@ def _vendor_aware_boot_device_map(task): # NOTE(TheJulia): Similar differences may exist with Cisco UCS # hardware when using IPMI, however at present we don't know # what the setting would be. - # NOTE(TheJulia) I've observed "mc info" manufacter name of a cisco + # NOTE(TheJulia) I've observed "mc info" manufacturer name of a cisco # c-series machine to return "Unknown (0x168B)" return boot_dev_map diff --git a/ironic/tests/unit/api/test_rbac_project_scoped.yaml b/ironic/tests/unit/api/test_rbac_project_scoped.yaml index 386adb048d..a675119677 100644 --- a/ironic/tests/unit/api/test_rbac_project_scoped.yaml +++ b/ironic/tests/unit/api/test_rbac_project_scoped.yaml @@ -487,7 +487,7 @@ owner_member_can_patch_all_the_things: value: "43" assert_status: 503 -# FIXME(TheJulia): This should be with member privilges below. +# FIXME(TheJulia): This should be with member privileges below. owner_member_can_change_lessee: path: '/v1/nodes/{owner_node_ident}' method: patch diff --git a/ironic/tests/unit/common/test_neutron.py b/ironic/tests/unit/common/test_neutron.py index 15918b25fd..d0a8e80e73 100644 --- a/ironic/tests/unit/common/test_neutron.py +++ b/ironic/tests/unit/common/test_neutron.py @@ -1431,7 +1431,7 @@ class TestNeutronNetworkInterfaceMixin(db_base.DbTestCase): self.node = object_utils.create_test_node(self.context) def test_get_network_names_and_uuids(self): - """A test to validate confiured overrides work.""" + """A test to validate configured overrides work.""" for name in ['cleaning', 'provisioning', 'rescuing', 'inspection', 'servicing']: method_name = 'get_{}_network_uuid'.format(name) diff --git a/ironic/tests/unit/conductor/mgr_utils.py b/ironic/tests/unit/conductor/mgr_utils.py index f300339466..40c98dff2f 100644 --- a/ironic/tests/unit/conductor/mgr_utils.py +++ b/ironic/tests/unit/conductor/mgr_utils.py @@ -128,7 +128,7 @@ class ServiceSetUpMixin(object): super(ServiceSetUpMixin, self).setUp() self.hostname = 'test-host' # Relies upon the default number of "NodeLocked" retries as - # in unit testing, sqllite is not operated in a transactional + # in unit testing, sqlite is not operated in a transactional # way and utilizes asynchronous IO. Locking, in particular, can # detect this, and it can cause some false or delayed inpressions # of lock status, causing lock failures. diff --git a/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml b/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml index ac312900a8..aa5508baca 100644 --- a/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml +++ b/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml @@ -18,7 +18,7 @@ upgrade: * ``resource_class`` An example of the SQL commands to generate these indexes can be found - in the `tuning `_ + in the `tuning `_ documentation. In testing with mock data, each column took approximately about 4 seconds diff --git a/releasenotes/notes/grub-default-change-to-mac-1e301a96c49acec4.yaml b/releasenotes/notes/grub-default-change-to-mac-1e301a96c49acec4.yaml index 4fb51bd65d..74c06f5a31 100644 --- a/releasenotes/notes/grub-default-change-to-mac-1e301a96c49acec4.yaml +++ b/releasenotes/notes/grub-default-change-to-mac-1e301a96c49acec4.yaml @@ -4,7 +4,7 @@ upgrade: Operators utilizing ``grub`` for PXE booting, typically with UEFI, should change their deployed master PXE configuration file provided for nodes PXE booting using grub. Ironic 11.1 now writes both MAC address and IP address - based PXE confiuration links for network booting via ``grub``. + based PXE configuration links for network booting via ``grub``. The grub variable should be changed from ``$net_default_ip`` to ``$net_default_mac``. IP address support is deprecated and will be removed in the Stein release. diff --git a/releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml b/releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml index f6178235b0..151722d3e2 100644 --- a/releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml +++ b/releasenotes/notes/remove-discoverd-group-03eaf75e9f94d7be.yaml @@ -1,5 +1,5 @@ --- upgrade: - - Removes support for the deprecated "discoverd" group + - Removes support for the deprecated "discovered" group for inspection options. Configuration files should use the "inspector" group instead. diff --git a/setup.cfg b/setup.cfg index 2c18bae38f..66924b7846 100644 --- a/setup.cfg +++ b/setup.cfg @@ -237,5 +237,9 @@ quiet-level = 4 # ser: short for serialize # CNA: Computer Network Administrator # MyRAID: class name -ignore-words-list = selectin,exept,taks,ser,wit,cna,myraid,dum +# assertIn: used in unit testing +# checkin: variable +# authenticatin: misspelled in the real-world output data we use as a test fixture +# burnin: documentation referencing actual method name +ignore-words-list = selectin,exept,taks,ser,wit,cna,myraid,dum,assertin,checkin,authenticatin,burnin skip = AUTHORS,ChangeLog,*.pyc,*.inv,*.svg,*.png,*.sample,./doc/build/*,./api-ref/build/*,./releasenotes/build/*,./api-ref/build/*,./build/* diff --git a/tox.ini b/tox.ini index b4c0c8378d..fe4c635061 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,6 @@ deps= doc8~=1.1.0 # Apache-2.0 pycodestyle>=2.0.0,<3.0.0 # MIT flake8-import-order~=0.18.0 # LGPLv3 - Pygments~=2.17.0 # BSD bashate~=2.1.0 # Apache-2.0 -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} allowlist_externals = bash