From 6dbc5f02887028872ebfcb7107eabf6f4c9509a5 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Fri, 18 Jun 2021 17:28:23 +0530 Subject: [PATCH] Replacing PRODUCT with CloudStack --- .../locale/zh_CN/LC_MESSAGES/events.po | 4 +- .../networking/persistent_networks.po | 4 +- .../locale/zh_CN/LC_MESSAGES/networking2.po | 2 +- .../LC_MESSAGES/networking_and_traffic.po | 2 +- .../locale/zh_CN/LC_MESSAGES/usage.po | 4 +- .../conceptsandterminology/locale/pot/dev.pot | 2 +- .../locale/pot/networking.pot | 10 +-- source/developersguide/dev.rst | 76 +++++++++---------- source/installguide/hypervisor/hyperv.rst | 26 +++---- .../locale/pot/hypervisor/hyperv.pot | 10 +-- .../zh_CN/LC_MESSAGES/hypervisor/hyperv.po | 12 +-- .../zh_CN/LC_MESSAGES/managing_networks.po | 4 +- source/plugins/vxlan.rst | 46 +++++------ 13 files changed, 101 insertions(+), 101 deletions(-) diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/events.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/events.po index 26aa1ffb59..880ddf293f 100644 --- a/source/adminguide/locale/zh_CN/LC_MESSAGES/events.po +++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/events.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. -# +# # Translators: msgid "" msgstr "" @@ -51,7 +51,7 @@ msgid "" "event logs can be used to gain more information on the status of a pending " "job or can be used to identify a job that is hanging or has not started. The" " following sections provide more information on these events.." -msgstr "这里有两种类型的事件记录在&PRODUCT;事件日志。标准事件记录一个事件的成功或失败，并且可以用于鉴别哪些是已经失败的任务或进程。这里也记录长时间运行任务事件。异步任务的制定，启动，完成这些事件都被记录。长时间运行的同步和异步事件日志可用于获取挂起任务更多的状态信息，也可以用来识别任务是被挂起或还未开始。以下各节提供有关这些事件的详细信息。" +msgstr "这里有两种类型的事件记录在&CloudStack;事件日志。标准事件记录一个事件的成功或失败，并且可以用于鉴别哪些是已经失败的任务或进程。这里也记录长时间运行任务事件。异步任务的制定，启动，完成这些事件都被记录。长时间运行的同步和异步事件日志可用于获取挂起任务更多的状态信息，也可以用来识别任务是被挂起或还未开始。以下各节提供有关这些事件的详细信息。" # 127295678f0c4cf084cf737444f11087 #: ../../events.rst:45 diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/persistent_networks.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/persistent_networks.po index 89352a5eb2..70933a5469 100644 --- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/persistent_networks.po +++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking/persistent_networks.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. -# +# # Translators: msgid "" msgstr "" @@ -41,7 +41,7 @@ msgid "" "ability to create a network in CloudStack in which physical devices can be " "deployed without having to run any VMs. Additionally, you can deploy " "physical devices on that network." -msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&PRODUCT;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" +msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&CloudStack;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" # 87f88f46858c41ba96f785b7c3122342 #: ../../networking/persistent_networks.rst:33 diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po index 494b91a3f6..6f35590cf5 100644 --- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po +++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking2.po @@ -8330,7 +8330,7 @@ msgid "" "ability to create a network in CloudStack in which physical devices can be " "deployed without having to run any VMs. Additionally, you can deploy " "physical devices on that network." -msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&PRODUCT;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" +msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&CloudStack;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" # 58f4be07725f415581616cb03772a7a7 #: ../../networking2.rst:6869 diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po index d6136d3f72..fdf865dac1 100644 --- a/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po +++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/networking_and_traffic.po @@ -8553,7 +8553,7 @@ msgid "" "ability to create a network in CloudStack in which physical devices can be " "deployed without having to run any VMs. Additionally, you can deploy " "physical devices on that network." -msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&PRODUCT;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" +msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&CloudStack;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" # 6fcce92beeff40cb864882157e6e38eb #: ../../networking/persistent_networks.rst:33 diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/usage.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/usage.po index 253aee27ad..3257e4f7ef 100644 --- a/source/adminguide/locale/zh_CN/LC_MESSAGES/usage.po +++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/usage.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) # This file is distributed under the same license as the Apache CloudStack Administration Documentation package. -# +# # Translators: msgid "" msgstr "" @@ -202,7 +202,7 @@ msgid "" "October 7, then it is assumed you would like to process records for October " "6, from midnight to midnight. CloudStack assumes this “midnight to midnight”" " is relative to the usage.execution.timezone." -msgstr "当值为1440（一天一次）时有点特殊。该情况下，用量服务器并不需要处理上次运行之后的所有事件。&PRODUCT;假定您要一天一次处理昨天的，完成每日记录。例如，如果今天是10月7号，会假定您要处理6号的记录，从0点到24点。CloudStack假定的0点到24点采用的时区为 usage.execution.timezone的值。" +msgstr "当值为1440（一天一次）时有点特殊。该情况下，用量服务器并不需要处理上次运行之后的所有事件。&CloudStack;假定您要一天一次处理昨天的，完成每日记录。例如，如果今天是10月7号，会假定您要处理6号的记录，从0点到24点。CloudStack假定的0点到24点采用的时区为 usage.execution.timezone的值。" # 657e01fff8404e7086e1a5cd318ed5b9 #: ../../usage.rst:121 diff --git a/source/conceptsandterminology/locale/pot/dev.pot b/source/conceptsandterminology/locale/pot/dev.pot index da7742a6ed..b83641edcd 100644 --- a/source/conceptsandterminology/locale/pot/dev.pot +++ b/source/conceptsandterminology/locale/pot/dev.pot @@ -2517,7 +2517,7 @@ msgstr "" #: ../../dev.rst:1323 # 116de5edf8e449378280c02a410c56f1 -msgid "The following time zone identifiers are accepted by PRODUCT. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table." +msgid "The following time zone identifiers are accepted by CloudStack. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table." msgstr "" #: ../../dev.rst:1329 diff --git a/source/conceptsandterminology/locale/pot/networking.pot b/source/conceptsandterminology/locale/pot/networking.pot index c27f11ebf1..c6241c5117 100644 --- a/source/conceptsandterminology/locale/pot/networking.pot +++ b/source/conceptsandterminology/locale/pot/networking.pot @@ -1608,7 +1608,7 @@ msgstr "" #: ../../networking/vxlan.rst:7 # 0856b955a54e4897a16abb275756a9fd -msgid "In PRODUCT 4.X.0, this plugin only supports the KVM hypervisor with the standard linux bridge." +msgid "In CloudStack 4.X.0, this plugin only supports the KVM hypervisor with the standard linux bridge." msgstr "" #: ../../networking/vxlan.rst:10 @@ -1635,7 +1635,7 @@ msgstr "" #: ../../networking/vxlan.rst:15 # e5bde3c30dc5441eb12a4ec4b45e7060 -msgid "OvsVifDriver is not supported by this plugin in PRODUCT 4.X, use BridgeVifDriver (default)." +msgid "OvsVifDriver is not supported by this plugin in CloudStack 4.X, use BridgeVifDriver (default)." msgstr "" #: ../../networking/vxlan.rst:17 @@ -1785,7 +1785,7 @@ msgstr "" #: ../../networking/vxlan.rst:137 # 6082e428d1cb4b658d787c71d0ad1dd5 -msgid "Configure PRODUCT to use VXLAN Plugin" +msgid "Configure CloudStack to use VXLAN Plugin" msgstr "" #: ../../networking/vxlan.rst:140 @@ -1800,7 +1800,7 @@ msgstr "" #: ../../networking/vxlan.rst:145 # 0b30975586c54132a8722bffbd37f88d -msgid "In addition to \"KVM Hypervisor Host Installation\" in \"PRODUCT Installation Guide\", you have to configure the following item on the host." +msgid "In addition to \"KVM Hypervisor Host Installation\" in \"CloudStack Installation Guide\", you have to configure the following item on the host." msgstr "" #: ../../networking/vxlan.rst:150 @@ -1905,7 +1905,7 @@ msgstr "" #: ../../networking/vxlan.rst:346 # 151a7ea2c74744eeb7e1c0a2c6efa55e -msgid "In almost all parts of zone setup, you can just follow the advanced zone setup istruction in \"PRODUCT Installation Guide\" to use this plugin. It is not required to add a network element nor to reconfigure the network offering. The only thing you have to do is configure the physical network to use VXLAN as the isolation method for Guest Network." +msgid "In almost all parts of zone setup, you can just follow the advanced zone setup istruction in \"CloudStack Installation Guide\" to use this plugin. It is not required to add a network element nor to reconfigure the network offering. The only thing you have to do is configure the physical network to use VXLAN as the isolation method for Guest Network." msgstr "" #: ../../networking/vxlan.rst:353 diff --git a/source/developersguide/dev.rst b/source/developersguide/dev.rst index 8733e086f3..f35333c653 100644 --- a/source/developersguide/dev.rst +++ b/source/developersguide/dev.rst @@ -15,7 +15,7 @@ Programmer Guide -================ +================ This guide shows how to develop CloudStack, use the API for operation and integration, access the usage data and use CloudStack specific tools @@ -64,7 +64,7 @@ API Reference Documentation You can find all the API reference documentation at the below site: -`https://cloudstack.apache.org/api.html +`https://cloudstack.apache.org/api.html `__ @@ -156,9 +156,9 @@ Breaking this down, we have several distinct parts to this URL. - Command String: This part of the query string comprises of the command, its parameters, and the API Key that identifies the account. - .. note:: - As with all query string parameters of field-value pairs, the "field" - component is case insensitive while all "value" values are case + .. note:: + As with all query string parameters of field-value pairs, the "field" + component is case insensitive while all "value" values are case sensitive. .. sourcecode: bash @@ -216,9 +216,9 @@ step interactive session using Python. First import the required modules: .. parsed-literal:: - + $python - Python 2.7.3 (default, Nov 17 2012, 19:54:34) + Python 2.7.3 (default, Nov 17 2012, 19:54:34) [GCC 4.2.1 Compatible Apple Clang 4.1 ((tags/Apple/clang-421.11.66))] on darwin Type "help", "copyright", "credits" or "license" for more information. >>> import urllib2 @@ -226,7 +226,7 @@ First import the required modules: >>> import hashlib >>> import hmac >>> import base64 - + Define the endpoint of the Cloud, the command that you want to execute and the keys of the user. @@ -239,7 +239,7 @@ and the keys of the user. >>> request['response']='json' >>> request['apikey']='plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg' >>> secretkey='VDaACYb0LV9eNjTetIOElcVQkvJck_J_QljX_FcHRj87ZKiy0z0ty0ZsYBkoXkY9b7eq1EhwJaw7FF3akA3KBQ' - + Build the request string: @@ -248,14 +248,14 @@ Build the request string: >>> request_str='&'.join(['='.join([k,urllib.quote_plus(request[k])]) for k in request.keys()]) >>> request_str 'apikey=plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg&command=listUsers&response=json' - + Compute the signature with hmac, do a 64 bit encoding and a url encoding: .. parsed-literal:: - - >>> sig_str='&'.join(['='.join([k.lower(),urllib.quote_plus(request[k]).lower().replace('+','%20')])for k in sorted(request.iterkeys())]) + + >>> sig_str='&'.join(['='.join([k.lower(),urllib.quote_plus(request[k]).lower().replace('+','%20')])for k in sorted(request.iterkeys())]) >>> sig_str 'apikey=plgwjfzk4gys3momtvmjuvg-x-jlwlnfauj9gabbbf9edm-kaymmailqzzq1elzlyq_u38zcm0bewzgudp66mg&command=listusers&response=json' >>> sig=hmac.new(secretkey,sig_str,hashlib.sha1) >>> sig @@ -270,19 +270,19 @@ encoding: >>> sig 'TTpdDq/7j/J58XCRHomKoQXEQds=' >>> sig=urllib.quote_plus(base64.encodestring(hmac.new(secretkey,sig_str,hashlib.sha1).digest()).strip()) - + Finally, build the entire string and do an http GET: .. parsed-literal:: - + >>> req=baseurl+request_str+'&signature='+sig >>> req 'http://localhost:8080/client/api?apikey=plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg&command=listUsers&response=json&signature=TTpdDq%2F7j%2FJ58XCRHomKoQXEQds%3D' >>> res=urllib2.urlopen(req) >>> res.read() '{ "listusersresponse" : { "count":3 ,"user" : [ {"id":"7ed6d5da-93b2-4545-a502-23d20b48ef2a","username":"admin","firstname":"admin","lastname":"cloud","created":"2012-07-05T12:18:27-0700","state":"enabled","account":"admin","accounttype":1,"domainid":"8a111e58-e155-4482-93ce-84efff3c7c77","domain":"ROOT","apikey":"plgWJfZK4gyS3mOMTVmjUVg-X-jlWlnfaUJ9GAbBbf9EdM-kAYMmAiLqzzq1ElZLYq_u38zCm0bewzGUdP66mg","secretkey":"VDaACYb0LV9eNjTetIOElcVQkvJck_J_QljX_FcHRj87ZKiy0z0ty0ZsYBkoXkY9b7eq1EhwJaw7FF3akA3KBQ","accountid":"7548ac03-af1d-4c1c-9064-2f3e2c0eda0d"}, {"id":"1fea6418-5576-4989-a21e-4790787bbee3","username":"runseb","firstname":"foobar","lastname":"goa","email":"joe@smith.com","created":"2013-04-10T16:52:06-0700","state":"enabled","account":"admin","accounttype":1,"domainid":"8a111e58-e155-4482-93ce-84efff3c7c77","domain":"ROOT","apikey":"Xhsb3MewjJQaXXMszRcLvQI9_NPy_UcbDj1QXikkVbDC9MDSPwWdtZ1bUY1H7JBEYTtDDLY3yuchCeW778GkBA","secretkey":"gIsgmi8C5YwxMHjX5o51pSe0kqs6JnKriw0jJBLceY5bgnfzKjL4aM6ctJX-i1ddQIHJLbLJDK9MRzsKk6xZ_w","accountid":"7548ac03-af1d-4c1c-9064-2f3e2c0eda0d"}, {"id":"52f65396-183c-4473-883f-a37e7bb93967","username":"toto","firstname":"john","lastname":"smith","email":"john@smith.com","created":"2013-04-23T04:27:22-0700","state":"enabled","account":"admin","accounttype":1,"domainid":"8a111e58-e155-4482-93ce-84efff3c7c77","domain":"ROOT","apikey":"THaA6fFWS_OmvU8od201omxFC8yKNL_Hc5ZCS77LFCJsRzSx48JyZucbUul6XYbEg-ZyXMl_wuEpECzK-wKnow","secretkey":"O5ywpqJorAsEBKR_5jEvrtGHfWL1Y_j1E4Z_iCr8OKCYcsPIOdVcfzjJQ8YqK0a5EzSpoRrjOFiLsG0hQrYnDA","accountid":"7548ac03-af1d-4c1c-9064-2f3e2c0eda0d"} ] } }' - + Enabling API Call Expiration ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -357,7 +357,7 @@ Limitations on API Throttling The following limitations exist in the current implementation of this feature. -.. note:: +.. note:: Even with these limitations, CloudStack is still able to effectively use API throttling to avoid malicious attacks causing denial of service. @@ -391,13 +391,13 @@ Sample XML Response: .. parsed-literal:: - + - 192.168.10.141 - 2009-09-18T13:16:10-0700 - 4 - WC - true + 192.168.10.141 + 2009-09-18T13:16:10-0700 + 4 + WC + true @@ -405,19 +405,19 @@ Sample JSON Response: .. parsed-literal:: - { "listipaddressesresponse" : + { "listipaddressesresponse" : { "allocatedipaddress" : - [ - { - "ipaddress" : "192.168.10.141", + [ + { + "ipaddress" : "192.168.10.141", "allocated" : "2009-09-18T13:16:10-0700", - "zoneid" : "4", - "zonename" : "WC", - "issourcenat" : "true" - } + "zoneid" : "4", + "zonename" : "WC", + "issourcenat" : "true" + } ] - } - } + } + } Maximum Result Pages Returned @@ -642,7 +642,7 @@ data. .. parsed-literal:: - + 1 100 @@ -660,7 +660,7 @@ Job is still pending: .. parsed-literal:: - + 1 0 1 @@ -725,12 +725,12 @@ Job has failed: .. parsed-literal:: - 1 - 2 + 1 + 2 0 551 text - Unable to deploy virtual machine id = 100 due to not enough capacity + Unable to deploy virtual machine id = 100 due to not enough capacity @@ -1290,7 +1290,7 @@ Event Types Time Zones ---------- -The following time zone identifiers are accepted by PRODUCT. There are +The following time zone identifiers are accepted by CloudStack. There are several places that have a time zone as a required or optional parameter. These include scheduling recurring snapshots, creating a user, and specifying the usage time zone in the Configuration table. diff --git a/source/installguide/hypervisor/hyperv.rst b/source/installguide/hypervisor/hyperv.rst index 476346177f..075c73917e 100644 --- a/source/installguide/hypervisor/hyperv.rst +++ b/source/installguide/hypervisor/hyperv.rst @@ -85,7 +85,7 @@ start: | | y | the file share for the Hyper-V deployment will be | | | | the new folder created in the \\Shares on the | | | | selected volume. You can create sub-folders for both | -| | | PRODUCT Primary and Secondary storage within the | +| | | CloudStack Primary and Secondary storage within the | | | | share location. When you select the profile for the | | | | file shares, ensure that you select SMB Share | | | | -Applications. This creates the file shares with | @@ -99,7 +99,7 @@ start: +------------+----------+------------------------------------------------------+ | Virtual | | If you are using Hyper-V 2012 R2, manually create an | | Switch | | external virtual switch before adding the host to | -| | | PRODUCT. If the Hyper-V host is added to the Hyper-V | +| | | CloudStack. If the Hyper-V host is added to the Hyper-V | | | | manager, select the host, then click Virtual Switch | | | | Manager, then New Virtual Switch. In the External | | | | Network, select the desired NIC adapter and click | @@ -109,7 +109,7 @@ start: | | | created automatically. | +------------+----------+------------------------------------------------------+ | Virtual | | Take a note of the name of the virtual switch. You | -| Switch | | need to specify that when configuring PRODUCT | +| Switch | | need to specify that when configuring CloudStack | | Name | | physical network labels. | +------------+----------+------------------------------------------------------+ | Hyper-V | | - Add the Hyper-V domain users to the Hyper-V | @@ -122,13 +122,13 @@ start: | | | - This domain user should be part of the Hyper-V | | | | Administrators and Local Administrators group on | | | | the Hyper-V hosts that are to be managed by | -| | | PRODUCT. | +| | | CloudStack. | | | | | | | | - The Hyper-V Agent service runs with the | | | | credentials of this domain user account. | | | | | | | | - Specify the credential of the domain user while | -| | | adding a host to PRODUCT so that it can manage | +| | | adding a host to CloudStack so that it can manage | | | | it. | | | | | | | | - Specify the credential of the domain user while | @@ -156,10 +156,10 @@ start: Hyper-V Installation Steps ~~~~~~~~~~~~~~~~~~~~~~~~~~ -#. Download the operating system from `Windows Server 2012 R2 +#. Download the operating system from `Windows Server 2012 R2 `_. -#. Install it on the host as given in `Install and Deploy Windows Server 2012 +#. Install it on the host as given in `Install and Deploy Windows Server 2012 R2 `_. #. Post installation, ensure that you enable Hyper-V role in the server. @@ -188,9 +188,9 @@ CloudStack Management Server communicates with Hyper-V Agent by using HTTPS. For secure communication between the Management Server and the host, install a self-signed certificate on port 8250. -.. note:: - The Agent installer automatically perform this operation. You have not - selected this option during the Agent installation, it can also be done +.. note:: + The Agent installer automatically perform this operation. You have not + selected this option during the Agent installation, it can also be done manually as given in step 1. #. Create and add a self-signed SSL certificate on port 8250: @@ -212,7 +212,7 @@ host, install a self-signed certificate on port 8250. Thumbprint is the thumbprint of the certificate you created. -#. Build the CloudStack Agent for Hyper-V as given in `Building CloudStack +#. Build the CloudStack Agent for Hyper-V as given in `Building CloudStack Hyper-V Agent `__. #. As an administrator, run the installer. @@ -248,13 +248,13 @@ Secondary Storage that uses SMB. #. Create a SMB storage and expose it over SMB Version 3. - For more information, see `Deploying Hyper-V over SMB + For more information, see `Deploying Hyper-V over SMB `_. You can also create and export SMB share using Windows. After the Windows Server 2012 R2 installation, select File and Storage Services from Server Roles to create an SMB file share. For more information, - see `Creating an SMB File Share Using Server Manager + see `Creating an SMB File Share Using Server Manager `_. #. Add the SMB share to the Active Directory domain. diff --git a/source/installguide/locale/pot/hypervisor/hyperv.pot b/source/installguide/locale/pot/hypervisor/hyperv.pot index f39595b5d2..a2f38cc184 100644 --- a/source/installguide/locale/pot/hypervisor/hyperv.pot +++ b/source/installguide/locale/pot/hypervisor/hyperv.pot @@ -148,7 +148,7 @@ msgstr "" #: ../../hypervisor/hyperv.rst:82 # 22eb1d2d75ef4c2b898ba205496f1923 -msgid "If you are using Windows SMB share, the location of the file share for the Hyper-V deployment will be the new folder created in the \\\\Shares on the selected volume. You can create sub-folders for both PRODUCT Primary and Secondary storage within the share location. When you select the profile for the file shares, ensure that you select SMB Share -Applications. This creates the file shares with settings appropriate for Hyper-V." +msgid "If you are using Windows SMB share, the location of the file share for the Hyper-V deployment will be the new folder created in the \\\\Shares on the selected volume. You can create sub-folders for both CloudStack Primary and Secondary storage within the share location. When you select the profile for the file shares, ensure that you select SMB Share -Applications. This creates the file shares with settings appropriate for Hyper-V." msgstr "" #: ../../hypervisor/hyperv.rst:92 @@ -183,7 +183,7 @@ msgstr "" #: ../../hypervisor/hyperv.rst:98 # 84b516f8c0844014922eb947cca2b078 -msgid "If you are using Hyper-V 2012 R2, manually create an external virtual switch before adding the host to PRODUCT. If the Hyper-V host is added to the Hyper-V manager, select the host, then click Virtual Switch Manager, then New Virtual Switch. In the External Network, select the desired NIC adapter and click Apply." +msgid "If you are using Hyper-V 2012 R2, manually create an external virtual switch before adding the host to CloudStack. If the Hyper-V host is added to the Hyper-V manager, select the host, then click Virtual Switch Manager, then New Virtual Switch. In the External Network, select the desired NIC adapter and click Apply." msgstr "" #: ../../hypervisor/hyperv.rst:106 @@ -200,7 +200,7 @@ msgstr "" #: ../../hypervisor/hyperv.rst:109 # cfebf27404b04a1799cecac6f0d87e84 -msgid "Take a note of the name of the virtual switch. You need to specify that when configuring PRODUCT physical network labels." +msgid "Take a note of the name of the virtual switch. You need to specify that when configuring CloudStack physical network labels." msgstr "" #: ../../hypervisor/hyperv.rst:113 @@ -220,7 +220,7 @@ msgstr "" #: ../../hypervisor/hyperv.rst:120 # b88a4f4ee49d4182aff6ba298990d862 -msgid "This domain user should be part of the Hyper-V Administrators and Local Administrators group on the Hyper-V hosts that are to be managed by PRODUCT." +msgid "This domain user should be part of the Hyper-V Administrators and Local Administrators group on the Hyper-V hosts that are to be managed by CloudStack." msgstr "" #: ../../hypervisor/hyperv.rst:125 @@ -230,7 +230,7 @@ msgstr "" #: ../../hypervisor/hyperv.rst:128 # 39ee910d4ba544e2b28f18e65ac8a889 -msgid "Specify the credential of the domain user while adding a host to PRODUCT so that it can manage it." +msgid "Specify the credential of the domain user while adding a host to CloudStack so that it can manage it." msgstr "" #: ../../hypervisor/hyperv.rst:132 diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/hyperv.po b/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/hyperv.po index 58627d263b..e0f6e9be3d 100644 --- a/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/hyperv.po +++ b/source/installguide/locale/zh_CN/LC_MESSAGES/hypervisor/hyperv.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) 2014, Apache Software Foundation # This file is distributed under the same license as the Apache CloudStack Installation Documentation package. -# +# # Translators: msgid "" msgstr "" @@ -164,7 +164,7 @@ msgstr "确保为主存储和辅助存储创建了文件夹。SMB共享和主机 msgid "" "If you are using Windows SMB share, the location of the file share for the " "Hyper-V deployment will be the new folder created in the \\\\Shares on the " -"selected volume. You can create sub-folders for both PRODUCT Primary and " +"selected volume. You can create sub-folders for both CloudStack Primary and " "Secondary storage within the share location. When you select the profile for" " the file shares, ensure that you select SMB Share -Applications. This " "creates the file shares with settings appropriate for Hyper-V." @@ -204,7 +204,7 @@ msgstr "虚拟交换机" #: ../../hypervisor/hyperv.rst:98 msgid "" "If you are using Hyper-V 2012 R2, manually create an external virtual switch" -" before adding the host to PRODUCT. If the Hyper-V host is added to the " +" before adding the host to CloudStack. If the Hyper-V host is added to the " "Hyper-V manager, select the host, then click Virtual Switch Manager, then " "New Virtual Switch. In the External Network, select the desired NIC adapter " "and click Apply." @@ -226,7 +226,7 @@ msgstr "虚拟交换机名称" #: ../../hypervisor/hyperv.rst:109 msgid "" "Take a note of the name of the virtual switch. You need to specify that when" -" configuring PRODUCT physical network labels." +" configuring CloudStack physical network labels." msgstr "" # ad1036d7fef9481ca332cd4247790520 @@ -250,7 +250,7 @@ msgstr "域用户应该对提供主存储和辅助存储的SMB共享拥有完全 #: ../../hypervisor/hyperv.rst:120 msgid "" "This domain user should be part of the Hyper-V Administrators and Local " -"Administrators group on the Hyper-V hosts that are to be managed by PRODUCT." +"Administrators group on the Hyper-V hosts that are to be managed by CloudStack." msgstr "" # a99dc8722cb14924894d5b59a0f7a3bb @@ -263,7 +263,7 @@ msgstr "Hyper-V代理服务使用域用户账号身份运行。" # 39ee910d4ba544e2b28f18e65ac8a889 #: ../../hypervisor/hyperv.rst:128 msgid "" -"Specify the credential of the domain user while adding a host to PRODUCT so " +"Specify the credential of the domain user while adding a host to CloudStack so " "that it can manage it." msgstr "" diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po b/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po index b453da837f..6fd390fdcd 100644 --- a/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po +++ b/source/installguide/locale/zh_CN/LC_MESSAGES/managing_networks.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) 2014, Apache Software Foundation # This file is distributed under the same license as the Apache CloudStack Installation Documentation package. -# +# # Translators: msgid "" msgstr "" @@ -8352,7 +8352,7 @@ msgid "" "ability to create a network in CloudStack in which physical devices can be " "deployed without having to run any VMs. Additionally, you can deploy " "physical devices on that network." -msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&PRODUCT;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" +msgstr "在您创建其它类型的网络时，在网络中第一台VM创建之前，该网络仅是数据库的一条记录。当第一个VM创建时，网络会指定一个VLAN ID并初始化。同样，当网络中最后一个VM销毁后，VLAN ID会被释放，这样该网络就不再可用。通过使用持久化网络，您就有能力在不部署VM的情况下在&CloudStack;中创建一个网络用来部署物理设备。而且，您可以在该网络中部署物理设备。" # 66f7d3c48a604609a402136b8672bae5 #: ../../managing_networks.rst:6759 diff --git a/source/plugins/vxlan.rst b/source/plugins/vxlan.rst index 98dd120d2e..dd2c14aca8 100644 --- a/source/plugins/vxlan.rst +++ b/source/plugins/vxlan.rst @@ -20,7 +20,7 @@ The VXLAN Plugin System Requirements for VXLAN ----------------------------- -In PRODUCT 4.X.0, this plugin only supports the KVM hypervisor with the +In CloudStack 4.X.0, this plugin only supports the KVM hypervisor with the standard linux bridge. The following table lists the requirements for the hypervisor. @@ -30,7 +30,7 @@ The following table lists the requirements for the hypervisor. +----------------+-----------------------------------------------+----------------------------------------------------------------------------------------------------------------+ | Item | Requirement | Note | +================+===============================================+================================================================================================================+ -| Hypervisor | KVM | OvsVifDriver is not supported by this plugin in PRODUCT 4.X, use BridgeVifDriver (default). | +| Hypervisor | KVM | OvsVifDriver is not supported by this plugin in CloudStack 4.X, use BridgeVifDriver (default). | +----------------+-----------------------------------------------+----------------------------------------------------------------------------------------------------------------+ | Linux kernel | version >= 3.7, VXLAN kernel module enabled | It is recommended to use kernel >=3.9, since Linux kernel categorizes the VXLAN driver as experimental <3.9. | +----------------+-----------------------------------------------+----------------------------------------------------------------------------------------------------------------+ @@ -75,7 +75,7 @@ To check the capability of your system, execute the following commands. $ ip link add type vxlan help # Confirm the output is usage of the command and that it's for VXLAN. # If it's not, your iproute2 utility doesn't support VXLAN. - + Important note on MTU size ~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -153,7 +153,7 @@ Build kernel $ sudo reboot # Select the new kernel during the boot process. - + Build iproute2 ^^^^^^^^^^^^^^ @@ -172,12 +172,12 @@ Build iproute2 $ ./configure $ make # -j N $ sudo make install - + .. note:: Please use rebuild kernel and tools at your own risk. -Configure PRODUCT to use VXLAN Plugin +Configure CloudStack to use VXLAN Plugin ------------------------------------- Configure hypervisor @@ -186,7 +186,7 @@ Configure hypervisor Configure hypervisor: KVM ^^^^^^^^^^^^^^^^^^^^^^^^^ -In addition to "KVM Hypervisor Host Installation" in "PRODUCT +In addition to "KVM Hypervisor Host Installation" in "CloudStack Installation Guide", you have to configure the following item on the host. @@ -245,7 +245,7 @@ you would change the configuration similar to below. IPV6_AUTOCONF=no DELAY=5 STP=yes - + Configure in Ubuntu ''''''''''''''''''' @@ -319,7 +319,7 @@ you would change the configuration similar to below. bridge_fd 5 bridge_stp off bridge_maxwait 1 - + Configure iptables to pass XVLAN packets ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -337,7 +337,7 @@ extra ports by executing the following iptable commands: :: $ sudo iptables -I INPUT -p udp -m udp --dport 8472 -j ACCEPT - + These iptable settings are not persistent accross reboots, we have to save them first. @@ -345,7 +345,7 @@ save them first. :: $ sudo iptables-save > /etc/sysconfig/iptables - + With this configuration you should be able to restart the network, although a reboot is recommended to see if everything works properly. @@ -354,10 +354,10 @@ although a reboot is recommended to see if everything works properly. $ sudo service network restart $ sudo reboot - -.. warning:: - Make sure you have an alternative way like IPMI or ILO to reach the machine + +.. warning:: + Make sure you have an alternative way like IPMI or ILO to reach the machine in case you made a configuration error and the network stops functioning! @@ -372,9 +372,9 @@ To open the required ports, execute the following commands: :: $ sudo ufw allow proto udp from any to any port 8472 - -.. note:: - By default UFW is not enabled on Ubuntu. Executing these commands with the + +.. note:: + By default UFW is not enabled on Ubuntu. Executing these commands with the firewall disabled does not enable the firewall. With this configuration you should be able to restart the network, @@ -384,9 +384,9 @@ although a reboot is recommended to see if everything works properly. $ sudo service networking restart $ sudo reboot - -.. warning:: - Make sure you have an alternative way like IPMI or ILO to reach the machine + +.. warning:: + Make sure you have an alternative way like IPMI or ILO to reach the machine in case you made a configuration error and the network stops functioning! @@ -394,7 +394,7 @@ Setup zone using VXLAN ~~~~~~~~~~~~~~~~~~~~~~ In almost all parts of zone setup, you can just follow the advanced zone -setup istruction in "PRODUCT Installation Guide" to use this plugin. It +setup istruction in "CloudStack Installation Guide" to use this plugin. It is not required to add a network element nor to reconfigure the network offering. The only thing you have to do is configure the physical network to use VXLAN as the isolation method for Guest Network. @@ -423,6 +423,6 @@ Configure the guest traffic Specify a range of VNIs you would like to use for carrying guest network traffic. -.. warning:: - VNI must be unique per zone and no duplicate VNIs can exist in the zone. +.. warning:: + VNI must be unique per zone and no duplicate VNIs can exist in the zone. Exercise care when designing your VNI allocation policy.