diff --git a/actions/cloud.py b/actions/cloud.py index 9a78d5b8..75310557 100755 --- a/actions/cloud.py +++ b/actions/cloud.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright 2020 Canonical Ltd +# Copyright 2020-2021 Canonical Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ def _set_service(state): Available states: - ServiceState.enabled: nova-scheduler can use this unit to run new VMs - - ServiceState.disabled : nova-scheduler wont schedule new VMs on this + - ServiceState.disabled : nova-scheduler won't schedule new VMs on this unit :type state: ServiceState """ diff --git a/hooks/nova_compute_context.py b/hooks/nova_compute_context.py index 5a154b82..31d89906 100644 --- a/hooks/nova_compute_context.py +++ b/hooks/nova_compute_context.py @@ -1,4 +1,4 @@ -# Copyright 2016 Canonical Ltd +# Copyright 2016-2021 Canonical Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -84,7 +84,7 @@ def _save_flag_file(path, data): shutil.chown(path, 'root', 'nova') -# compatability functions to help with quantum -> neutron transition +# compatibility functions to help with quantum -> neutron transition def _network_manager(): from nova_compute_utils import network_manager as manager return manager() @@ -924,7 +924,7 @@ class NeutronPluginSubordinateConfigContext(context.SubordinateConfigContext): It is ok for this context to be empty as the neutron-plugin may not require the nova-compute charm to add anything to its config. So - override the SubordinateConfigContext beaviour of marking the context + override the SubordinateConfigContext behaviour of marking the context incomplete if no config data has been sent. :param ctxt: The current context members diff --git a/hooks/nova_compute_hooks.py b/hooks/nova_compute_hooks.py index 7e091165..b08ab3e1 100755 --- a/hooks/nova_compute_hooks.py +++ b/hooks/nova_compute_hooks.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright 2016 Canonical Ltd +# Copyright 2016-2021 Canonical Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -431,7 +431,7 @@ def get_ceph_request(): # but is in effect driven by the number of rbd's rather than # their size - so it can be very lightweight. metadata_weight = weight * 0.01 - # Resize data pool weight to accomodate metadata weight + # Resize data pool weight to accommodate metadata weight weight = weight - metadata_weight # Create metadata pool rq.add_op_create_pool( diff --git a/hooks/nova_compute_utils.py b/hooks/nova_compute_utils.py index 1a70e588..73adf73e 100644 --- a/hooks/nova_compute_utils.py +++ b/hooks/nova_compute_utils.py @@ -1,4 +1,4 @@ -# Copyright 2016 Canonical Ltd +# Copyright 2016-2021 Canonical Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -456,7 +456,7 @@ def register_configs(): mkdir(os.path.dirname(CEPH_CONF)) # Install ceph config as an alternative for co-location with # ceph and ceph-osd charms - nova-compute ceph.conf will be - # lower priority that both of these but thats OK + # lower priority than both of these but that's OK if not os.path.exists(ceph_config_file()): # touch file for pre-templated generation open(ceph_config_file(), 'w').close() @@ -497,7 +497,7 @@ def determine_packages(): virt_type = config('virt-type') if virt_type == 'ironic' and release < 'victoria': # ironic compute driver is part of nova and - # gets installed allong with python3-nova + # gets installed along with python3-nova # The nova-compute-ironic metapackage that satisfies # nova-compute-hypervisor does not exist for versions of # OpenStack prior to Victoria. Use nova-compute-vmware, @@ -547,7 +547,7 @@ def determine_purge_packages(): def remove_old_packages(): - '''Purge any packages that need ot be removed. + '''Purge any packages that need to be removed. :returns: bool Whether packages were removed. ''' @@ -981,7 +981,7 @@ def assess_status_func(configs, services_=None): the unit. NOTE(ajkavanagh) ports are not checked due to race hazards with services - that don't behave sychronously w.r.t their service scripts. e.g. + that don't behave synchronously w.r.t their service scripts. e.g. apache2. @param configs: a templating.OSConfigRenderer() object @return f() -> None : a function that assesses the unit's workload status diff --git a/templates/libvirtd.conf b/templates/libvirtd.conf index a0187b57..45502c01 100644 --- a/templates/libvirtd.conf +++ b/templates/libvirtd.conf @@ -68,7 +68,7 @@ listen_tls = {{ listen_tls }} # unique on the immediate broadcast network. # # The default is "Virtualization Host HOSTNAME", where HOSTNAME -# is subsituted for the short hostname of the machine (without domain) +# is substituted for the short hostname of the machine (without domain) # #mdns_name = "Virtualization Host Joe Demo" @@ -386,7 +386,7 @@ host_uuid = "{{ host_uuid }}" # keepalive_interval * (keepalive_count + 1) seconds since the last # message received from the client. If keepalive_interval is set to # -1, libvirtd will never send keepalive requests; however clients -# can still send them and the deamon will send responses. When +# can still send them and the daemon will send responses. When # keepalive_count is set to 0, connections will be automatically # closed after keepalive_interval seconds of inactivity without # sending any keepalive messages. diff --git a/unit_tests/test_actions_cloud.py b/unit_tests/test_actions_cloud.py index 5b1c83f5..b792cd5e 100644 --- a/unit_tests/test_actions_cloud.py +++ b/unit_tests/test_actions_cloud.py @@ -1,4 +1,4 @@ -# Copyright 2020 Canonical Ltd +# Copyright 2020-2021 Canonical Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -218,7 +218,7 @@ class TestRegisterToCloud(_ActionTestCase): super(TestRegisterToCloud, self).setUp(to_mock=additional_mocks) def test_dont_reset_unit_status(self): - """Test that action wont reset unit state if the current state was not + """Test that action won't reset unit state if the current state was not set explicitly by 'remove-from-cloud' action""" cloud.status_get.return_value = (cloud.WORKLOAD_STATES.BLOCKED.value, 'Unrelated reason for blocked status') diff --git a/unit_tests/test_nova_compute_utils.py b/unit_tests/test_nova_compute_utils.py index b0c60eb9..68376397 100644 --- a/unit_tests/test_nova_compute_utils.py +++ b/unit_tests/test_nova_compute_utils.py @@ -1,4 +1,4 @@ -# Copyright 2016 Canonical Ltd +# Copyright 2016-2021 Canonical Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -640,7 +640,7 @@ class NovaComputeUtilsTests(CharmTestCase): call('auth_2\n') ] - # we only have to verify that the files are writen as expected as this + # we only have to verify that the files are written as expected as this # implicitly checks that the relation_get calls have occurred. with patch_open() as (_open, _file): utils.import_authorized_keys(user='foo', prefix=prefix) diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py index 77e40e5a..57613dd6 100644 --- a/unit_tests/test_utils.py +++ b/unit_tests/test_utils.py @@ -1,4 +1,4 @@ -# Copyright 2016 Canonical Ltd +# Copyright 2016-2021 Canonical Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ patch('charmhelpers.core.hookenv.status_set').start() def load_config(): ''' - Walk backwords from __file__ looking for config.yaml, load and return the + Walk backwards from __file__ looking for config.yaml, load and return the 'options' section' ''' config = None