summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/locale/bs/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/cs/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/da/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/de/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/en_AU/LC_MESSAGES/nova.po4
-rw-r--r--nova/locale/en_GB/LC_MESSAGES/nova.po4
-rw-r--r--nova/locale/en_US/LC_MESSAGES/nova.po4
-rw-r--r--nova/locale/es/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/fr/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/it/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/ja/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/ko/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/nb/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/nova.pot2
-rw-r--r--nova/locale/pt_BR/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/ru/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/tl/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/tr/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/tr_TR/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/uk/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/zh_CN/LC_MESSAGES/nova.po2
-rw-r--r--nova/locale/zh_TW/LC_MESSAGES/nova.po2
-rw-r--r--nova/network/linux_net.py2
-rw-r--r--nova/virt/vmwareapi/network_util.py2
24 files changed, 27 insertions, 27 deletions
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 1c828e2cc..a8c2f28aa 100644
--- a/nova/locale/bs/LC_MESSAGES/nova.po
+++ b/nova/locale/bs/LC_MESSAGES/nova.po
@@ -4105,7 +4105,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 5f16b0a97..728eb3e2f 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -4274,7 +4274,7 @@ msgstr "Pid %d je starý, znovu spouštění radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "Spouštění rozhraní VLAN %s"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 9110f1a19..c5bf005ae 100644
--- a/nova/locale/da/LC_MESSAGES/nova.po
+++ b/nova/locale/da/LC_MESSAGES/nova.po
@@ -4105,7 +4105,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 7648cb6b7..90888108b 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -4114,7 +4114,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index 34fe02f2f..85439f90d 100644
--- a/nova/locale/en_AU/LC_MESSAGES/nova.po
+++ b/nova/locale/en_AU/LC_MESSAGES/nova.po
@@ -4146,8 +4146,8 @@ msgstr "Pid %d is stale, relaunching radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
-msgstr "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
+msgstr "Starting VLAN interface %s"
#: nova/network/linux_net.py:1162
#, python-format
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index c4d5733bf..8578686a7 100644
--- a/nova/locale/en_GB/LC_MESSAGES/nova.po
+++ b/nova/locale/en_GB/LC_MESSAGES/nova.po
@@ -4128,8 +4128,8 @@ msgstr "Pid %d is stale, relaunching radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
-msgstr "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
+msgstr "Starting VLAN interface %s"
#: nova/network/linux_net.py:1162
#, python-format
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 74873ef96..1c33f1050 100644
--- a/nova/locale/en_US/LC_MESSAGES/nova.po
+++ b/nova/locale/en_US/LC_MESSAGES/nova.po
@@ -4228,8 +4228,8 @@ msgstr "Pid %d is stale, relaunching radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
-msgstr "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
+msgstr "Starting VLAN interface %s"
#: nova/network/linux_net.py:1162
#, python-format
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 4b51385c1..4f4881583 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -4156,7 +4156,7 @@ msgstr "Pid %d corrupto, relanzando radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "Iniciando interfaz VLAN %s"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index 5292926e8..d775eb199 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -4211,7 +4211,7 @@ msgstr "Pid %d est dépassé, re-démarrage radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "Démarrage de l'interface VLAN %s"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 53a40b994..5427d247c 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -4125,7 +4125,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "Avviando l'interfaccia VLAN %s"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index b97544a9a..0e3e5346e 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -4144,7 +4144,7 @@ msgstr "Pid %d がストールしているので radvd を再実行していま
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "VLANインタフェース %s を開始します。"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index a18f08a79..cb7d925b9 100644
--- a/nova/locale/ko/LC_MESSAGES/nova.po
+++ b/nova/locale/ko/LC_MESSAGES/nova.po
@@ -4116,7 +4116,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index 21004f601..d03094228 100644
--- a/nova/locale/nb/LC_MESSAGES/nova.po
+++ b/nova/locale/nb/LC_MESSAGES/nova.po
@@ -4111,7 +4111,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index d71debc88..743550929 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -4709,7 +4709,7 @@ msgstr ""
#: nova/network/linux_net.py:1349
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1380
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 2cb5d88d7..2f405e367 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -4146,7 +4146,7 @@ msgstr "Pid %d está ultrapassado, reiniciando radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "Iniciando a VLAN %s"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 16598be25..861172310 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -4238,7 +4238,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "Запуск интерфейса VLAN %s"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index ae13d3e6f..615df355f 100644
--- a/nova/locale/tl/LC_MESSAGES/nova.po
+++ b/nova/locale/tl/LC_MESSAGES/nova.po
@@ -4105,7 +4105,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 5b018ae45..c8c40af80 100644
--- a/nova/locale/tr/LC_MESSAGES/nova.po
+++ b/nova/locale/tr/LC_MESSAGES/nova.po
@@ -4105,7 +4105,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index 519a37857..a4bf0b4fa 100644
--- a/nova/locale/tr_TR/LC_MESSAGES/nova.po
+++ b/nova/locale/tr_TR/LC_MESSAGES/nova.po
@@ -4118,7 +4118,7 @@ msgstr "%d süreç numarası bozuldu, radvd tekrar başlatılıyor"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "%s VLAN arayüzü başlatılıyor "
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 936695312..f988ec3eb 100644
--- a/nova/locale/uk/LC_MESSAGES/nova.po
+++ b/nova/locale/uk/LC_MESSAGES/nova.po
@@ -4107,7 +4107,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index ce736d4f8..a39f63b07 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -4206,7 +4206,7 @@ msgstr "Pid %d 过期了,重新启动radvd"
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr "正在开启VLAN接口 %s"
#: nova/network/linux_net.py:1162
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index 91e75790b..5bba1017d 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -4113,7 +4113,7 @@ msgstr ""
#: nova/network/linux_net.py:1126
#, python-format
-msgid "Starting VLAN inteface %s"
+msgid "Starting VLAN interface %s"
msgstr ""
#: nova/network/linux_net.py:1162
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index ff8072690..317f2a309 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -1359,7 +1359,7 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
"""Create a vlan unless it already exists."""
interface = 'vlan%s' % vlan_num
if not device_exists(interface):
- LOG.debug(_('Starting VLAN inteface %s'), interface)
+ LOG.debug(_('Starting VLAN interface %s'), interface)
_execute('ip', 'link', 'add', 'link', bridge_interface,
'name', interface, 'type', 'vlan',
'id', vlan_num, run_as_root=True,
diff --git a/nova/virt/vmwareapi/network_util.py b/nova/virt/vmwareapi/network_util.py
index 5a83b0763..c353e66fd 100644
--- a/nova/virt/vmwareapi/network_util.py
+++ b/nova/virt/vmwareapi/network_util.py
@@ -113,7 +113,7 @@ def get_vswitch_for_vlan_interface(session, vlan_interface, cluster=None):
def check_if_vlan_interface_exists(session, vlan_interface, cluster=None):
- """Checks if the vlan_inteface exists on the esx host."""
+ """Checks if the vlan_interface exists on the esx host."""
host_mor = vm_util.get_host_ref(session, cluster)
physical_nics_ret = session._call_method(vim_util,
"get_dynamic_property", host_mor,