Merge "Fix typos in log messages"

container_config_scripts/pacemaker_mutex_shutdown.sh

@@ -98,7 +98,7 @@ LOCK_OWNER=$(crm_node -n 2>/dev/null)
 rc=$?
 if [ $rc -ne 0 ]; then
     if [ $rc -eq 102 ]; then
-        log "Cluster is not running locally, no need to aquire the shutdown lock"
+        log "Cluster is not running locally, no need to acquire the shutdown lock"
         exit 0
     else
         error "Unexpected error while connecting to the cluster (rc: $rc), bailing out"

deployment/neutron/derive_pci_passthrough_whitelist.py

@@ -52,9 +52,9 @@ def get_pci_field_val(
     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
 
 
@@ -71,7 +71,7 @@ def get_pciaddr_dict_from_usraddr(pci_addr: str):
     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

deployment/tests/test-container-volume.yaml

@@ -58,14 +58,14 @@ outputs:
               assert:
                 that:
                   - cinder_fake_group_var_one == 'var_one_override'
-                fail_msg: "cinder_fake_group_var_one was not overriden"
-                success_msg: "cinder_fake_group_var_one was overriden"
+                fail_msg: "cinder_fake_group_var_one was not overridden"
+                success_msg: "cinder_fake_group_var_one was overridden"
             - name: Test that cinder_fake_group_var_two was not overridden
               assert:
                 that:
                   - cinder_fake_group_var_two == 'var_two'
-                fail_msg: "cinder_fake_group_var_two was overriden"
-                success_msg: "cinder_fake_group_var_two was not overriden"
+                fail_msg: "cinder_fake_group_var_two was overridden"
+                success_msg: "cinder_fake_group_var_two was not overridden"
             - name: Create Test Volume facts
               set_fact:
                 test_container_cli: {get_param: ContainerCli}

deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

@@ -410,7 +410,7 @@ outputs:
           register: yum_pid_file
           when: step|int == 0 or step|int == 3
         - name: Exit if existing yum process
-          fail: msg="ERROR existing yum.pid detected - can't continue! Please ensure there is no other package update process for the duration of the minor update worfklow. Exiting."
+          fail: msg="ERROR existing yum.pid detected - can't continue! Please ensure there is no other package update process for the duration of the minor update workflow. Exiting."
           when: (step|int == 0 or step|int == 3) and yum_pid_file.stat.exists
         - name: Special treatment for OpenvSwitch
           tripleo_ovs_upgrade:

extraconfig/post_deploy/undercloud_ctlplane_network.py

@@ -152,7 +152,7 @@ def _neutron_add_subnet_segment_association(sdk, subnet_id, segment_id):
         subnet = sdk.network.update_subnet(subnet_id, segment_id=segment_id)
         print('INFO: Segment association added to Subnet  %s' % subnet)
     except Exception:
-        print('ERROR: Associationg segment with subnet %s failed.' % subnet_id)
+        print('ERROR: Associating segment with subnet %s failed.' % subnet_id)
         raise
 
 

tools/convert_heat_nic_config_to_ansible_j2.py

@@ -271,7 +271,7 @@ class ConvertToAnsibleJ2(object):
         attr = old['get_attr']
         if not isinstance(attr, list):
             raise RuntimeError(
-                'Attributes for get_attr convertsion must of type list.')
+                'Attributes for get_attr conversion must of type list.')
 
         if 'MinViableMtu' in attr:
             return self.to_j2_var('min_viable_mtu')
@@ -378,7 +378,7 @@ class ConvertToAnsibleJ2(object):
                                    'MinViableMtu',
                                    'MinViableMtuBondApi',
                                    'MinViableMtuBondData'}):
-            msg = ('Only OsNetConfigImpl and MinViableMtu resoureces '
+            msg = ('Only OsNetConfigImpl and MinViableMtu resources '
                    'supported. Found resources: {}'.format(resources))
             raise RuntimeError(msg)
 

tools/convert_nic_config.py

@@ -26,7 +26,7 @@ def parse_opts(argv):
             description='Convert to new NIC config templates with '
                         'OS::Heat::Value resources.')
     parser.add_argument('-t', '--template', metavar='TEMPLATE_FILE',
-                        help=("Existing NIC config template to conver."),
+                        help=("Existing NIC config template to convert."),
                         required=True)
     parser.add_argument('--discard-comments', metavar='DISCARD_COMMENTS',
                         help="Discard comments from the template. (The "
@@ -168,7 +168,7 @@ def backup_template(template):
     extension = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
     backup_filename = os.path.realpath(template) + '.' + extension
     if os.path.exists(backup_filename):
-        raise RuntimeError('Backupe file: %s already exists. Aborting!'
+        raise RuntimeError('Backup file: %s already exists. Aborting!'
                            % backup_filename)
     shutil.copyfile(template, backup_filename)
     print('The original template was saved as: %s' % backup_filename)

tools/merge-new-params-nic-config-script.py

@@ -240,7 +240,7 @@ def backup_template():
     extension = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
     backup_filename = os.path.realpath(OPTS.template) + '.' + extension
     if os.path.exists(backup_filename):
-        raise RuntimeError('Backupe file: %s already exists. Aborting!'
+        raise RuntimeError('Backup file: %s already exists. Aborting!'
                            % backup_filename)
     shutil.copyfile(OPTS.template, backup_filename)
     print('The original template was saved as: %s' % backup_filename)

tools/yaml-validate.py

@@ -681,7 +681,7 @@ def validate_docker_service(filename, tpl):
                 # add an exception if both step_config is used in docker service
                 if (section_name == 'docker_config' and
                         role_data.get('step_config', '')):
-                    print('ERROR: %s appears to be a barematal-puppet service'
+                    print('ERROR: %s appears to be a baremetal-puppet service'
                         % (filename))
                     return 1
                 print('ERROR: %s is required in role_data for %s.'