diff --git a/HACKING.rst b/HACKING.rst index d66687e351..d763c75b8b 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -328,7 +328,7 @@ There are some broad criteria that will be followed when reviewing your change * **Is it passing tests** -- your change will not be reviewed - throughly unless the official CI has run successfully against it. + thoroughly unless the official CI has run successfully against it. * **Does this belong in DevStack** -- DevStack reviewers have a default position of "no" but are ready to be convinced by your diff --git a/lib/dlm b/lib/dlm index f68ee26b4b..95e9b0ac3d 100644 --- a/lib/dlm +++ b/lib/dlm @@ -46,7 +46,7 @@ ZOOKEEPER_CONF_DIR=/etc/zookeeper # - cleanup_dlm # This should be declared in the settings file of any plugin or -# service that needs to have a dlm in their enviroment. +# service that needs to have a dlm in their environment. function use_dlm { enable_service $(dlm_backend) } diff --git a/lib/ironic b/lib/ironic index 016e639d03..6a32983b24 100644 --- a/lib/ironic +++ b/lib/ironic @@ -92,7 +92,7 @@ IRONIC_VM_LOG_DIR=${IRONIC_VM_LOG_DIR:-$IRONIC_DATA_DIR/logs/} # Use DIB to create deploy ramdisk and kernel. IRONIC_BUILD_DEPLOY_RAMDISK=$(trueorfalse True IRONIC_BUILD_DEPLOY_RAMDISK) # If not use DIB, these files are used as deploy ramdisk/kernel. -# (The value must be a absolute path) +# (The value must be an absolute path) IRONIC_DEPLOY_RAMDISK=${IRONIC_DEPLOY_RAMDISK:-} IRONIC_DEPLOY_KERNEL=${IRONIC_DEPLOY_KERNEL:-} IRONIC_DEPLOY_ELEMENT=${IRONIC_DEPLOY_ELEMENT:-deploy-ironic} @@ -672,7 +672,7 @@ function configure_iptables { # enable tftp natting for allowing connections to HOST_IP's tftp server sudo modprobe nf_conntrack_tftp sudo modprobe nf_nat_tftp - # explicitly allow DHCP - packets are occassionally being dropped here + # explicitly allow DHCP - packets are occasionally being dropped here sudo iptables -I INPUT -p udp --dport 67:68 --sport 67:68 -j ACCEPT || true # nodes boot from TFTP and callback to the API server listening on $HOST_IP sudo iptables -I INPUT -d $HOST_IP -p udp --dport 69 -j ACCEPT || true diff --git a/tests/test_meta_config.sh b/tests/test_meta_config.sh index f3e94af8f8..327fb56185 100755 --- a/tests/test_meta_config.sh +++ b/tests/test_meta_config.sh @@ -24,7 +24,7 @@ function check_result { } # mock function-common:die so that it does not -# interupt our test script +# interrupt our test script function die { exit -1 } diff --git a/tests/unittest.sh b/tests/unittest.sh index 2570319fbf..26b5b8e592 100644 --- a/tests/unittest.sh +++ b/tests/unittest.sh @@ -46,7 +46,7 @@ function failed { ERROR=$((ERROR+1)) } -# assert string comparision of val1 equal val2, printing out msg +# assert string comparison of val1 equal val2, printing out msg # usage: assert_equal val1 val2 msg function assert_equal { local lineno