diff --git a/puppet-manifests/src/modules/openstack/manifests/cinder.pp b/puppet-manifests/src/modules/openstack/manifests/cinder.pp index fa68915fe7..2cef30a78b 100644 --- a/puppet-manifests/src/modules/openstack/manifests/cinder.pp +++ b/puppet-manifests/src/modules/openstack/manifests/cinder.pp @@ -203,7 +203,7 @@ class openstack::cinder cinder_config { 'DEFAULT/my_ip': value => $controller_address; 'DEFAULT/state_path': value => "${cinder_directory}/data"; - # Reduce the number of RPCs that can be handled in parallel from the the + # Reduce the number of RPCs that can be handled in parallel from the # default of 64. Doing too much at once (e.g. creating volumes) results # in a lot of thrashing and operations time out. # Liberty renamed this from rpc_thread_pool_size to executor_thread_pool_size diff --git a/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/lib/puppet/provider/proxy_config/ini_setting.rb b/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/lib/puppet/provider/proxy_config/ini_setting.rb index df2979f80f..126e4d12e9 100644 --- a/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/lib/puppet/provider/proxy_config/ini_setting.rb +++ b/puppet-modules-wrs/puppet-nova_api_proxy/src/nova_api_proxy/lib/puppet/provider/proxy_config/ini_setting.rb @@ -20,8 +20,7 @@ Puppet::Type.type(:proxy_config).provide( end # assumes that the name was the setting - # this is to maintain backwards compat with the the older - # stuff + # this is to maintain backwards compat with the older stuff def setting resource[:name].split('/', 2)[1] end diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu.py index bb243927ae..79e6a429a7 100644 --- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu.py +++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/cpu.py @@ -504,7 +504,7 @@ def _update_vswitch_cpu_counts(host, cpu, counts, capabilities=None): raise wsme.exc.ClientSideError(_('vSwitch cpus must be non-negative.')) if host.hyperthreading: # the data structures track the number of logical cpus and the - # API expects the the requested count to refer to the number + # API expects the requested count to refer to the number # of physical cores requested therefore if HT is enabled then # multiply the requested number by 2 so that we always reserve a # full physical core @@ -536,7 +536,7 @@ def _update_shared_cpu_counts(host, cpu, counts, capabilities=None): raise wsme.exc.ClientSideError(_('Shared count cannot be > 1.')) if host.hyperthreading: # the data structures track the number of logical cpus and the - # API expects the the requested count to refer to the number + # API expects the requested count to refer to the number # of physical cores requested therefore if HT is enabled then # multiply the requested number by 2 so that we always reserve a # full physical core @@ -566,7 +566,7 @@ def _update_platform_cpu_counts(host, cpu, counts, capabilities=None): raise wsme.exc.ClientSideError(_('Platform cpus must be non-negative.')) if host.hyperthreading: # the data structures track the number of logical cpus and the - # API expects the the requested count to refer to the number + # API expects the requested count to refer to the number # of physical cores requested therefore if HT is enabled then # multiply the requested number by 2 so that we always reserve a # full physical core diff --git a/sysinv/sysinv/sysinv/sysinv/common/states.py b/sysinv/sysinv/sysinv/sysinv/common/states.py index 4d2a82ae60..b6d16d4c73 100644 --- a/sysinv/sysinv/sysinv/sysinv/common/states.py +++ b/sysinv/sysinv/sysinv/sysinv/common/states.py @@ -28,7 +28,7 @@ validated by the driver. Any node with non-empty `properties` is said to be When the driver has received both `properties` and `driver_info`, it will check the power status of the node and update the `power_state` accordingly. If the -driver fails to read the the power state from the node, it will reject the +driver fails to read the power state from the node, it will reject the `driver_info` change, and the state will remain as INIT. If the power status check succeeds, `power_state` will change to one of POWER_ON or POWER_OFF, accordingly. diff --git a/sysinv/sysinv/sysinv/sysinv/common/utils.py b/sysinv/sysinv/sysinv/sysinv/common/utils.py index 686855b385..981dd8b468 100644 --- a/sysinv/sysinv/sysinv/sysinv/common/utils.py +++ b/sysinv/sysinv/sysinv/sysinv/common/utils.py @@ -365,7 +365,7 @@ def is_valid_boolstr(val): def is_valid_mac(address): - """Verify the format of a MAC addres.""" + """Verify the format of a MAC address.""" m = "[0-9a-f]{2}([-:])[0-9a-f]{2}(\\1[0-9a-f]{2}){4}$" if isinstance(address, six.string_types) and re.match(m, address.lower()): return True @@ -940,7 +940,7 @@ def is_virtual_compute(ihost): def is_low_core_system(ihost, dba): """ Determine if the hosts core count is less than or equal to a xeon-d cpu - used with get_required_platform_reserved_memory to set the the required + used with get_required_platform_reserved_memory to set the required platform memory for xeon-d systems """ cpu_list = dba.icpu_get_by_ihost(ihost['uuid']) diff --git a/sysinv/sysinv/sysinv/sysinv/openstack/common/rpc/proxy.py b/sysinv/sysinv/sysinv/sysinv/openstack/common/rpc/proxy.py index 25c057c83e..ec20d1f577 100644 --- a/sysinv/sysinv/sysinv/sysinv/openstack/common/rpc/proxy.py +++ b/sysinv/sysinv/sysinv/sysinv/openstack/common/rpc/proxy.py @@ -36,7 +36,7 @@ class RpcProxy(object): rpc API. """ - # The default namespace, which can be overriden in a subclass. + # The default namespace, which can be overridden in a subclass. RPC_API_NAMESPACE = None def __init__(self, topic, default_version, version_cap=None, diff --git a/sysinv/sysinv/sysinv/sysinv/tests/README.txt b/sysinv/sysinv/sysinv/sysinv/tests/README.txt index 5341023e1a..5ca8e36a91 100644 --- a/sysinv/sysinv/sysinv/sysinv/tests/README.txt +++ b/sysinv/sysinv/sysinv/sysinv/tests/README.txt @@ -124,7 +124,7 @@ tests/api/test_invservers.py tests/conductor/test_manager.py test_configure_ihost_new IOError: [Errno 13] Permission denied: '/tmp/dnsmasq.hosts' - This directory does not exist. I am not sure if this this directory is + This directory does not exist. I am not sure if this directory is still supposed to exist, if it has moved, or if this entire test is based on deprecated/replaced functionality.