Skip to content

Commit 310ae8a

Browse files
authored
Fixed formatting warnings (#460)
1 parent 96f614e commit 310ae8a

File tree

18 files changed

+165
-131
lines changed

18 files changed

+165
-131
lines changed

source/adminguide/api.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,16 @@ the user data:
6464
#. Run the following command to find the virtual router.
6565

6666
.. code:: bash
67+
6768
# cat /var/lib/dhclient/dhclient-eth0.leases | grep dhcp-server-identifier | tail -1
69+
6870
#. Access user data by running the following command using the result of
6971
the above command
7072

7173
.. code:: bash
74+
7275
# curl http://10.1.1.1/latest/user-data
76+
7377
Meta Data can be accessed similarly, using a URL of the form
7478
http://10.1.1.1/latest/meta-data/{metadata type}. (For backwards
7579
compatibility, the previous URL http://10.1.1.1/latest/{metadata type}

source/adminguide/host_and_storage_tags.rst

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,39 @@ There are two types of host tags:
3131
To explain the behavior of host tags, some examples will be demonstrated with two hosts (Host1 and Host2):
3232

3333
#. Tag setup:
34+
3435
* Host1: h1
3536
* Host2: h2
3637
* Offering: h1
38+
3739
When a VM is created with the offering, the deployment will be carried out on Host1, as it is the one that has the tag compatible with the offering.
3840

3941
#. Tag setup:
42+
4043
* Host1: h1
4144
* Host2: h2,h3
4245
* Offering: h3
46+
4347
Hosts and offerings accept a list of tags, with comma (,) being their separator. So in this example, Host2 has the h2 and h3 tags. When a VM is created with the offering, the deployment will be carried out on Host2, as it is the one that has the tag compatible with the offering.
4448

4549
#. Tag setup:
50+
4651
* Host1: h1
4752
* Host2: h2,h3
4853
* Offering: (no tag)
54+
4955
When the offering does not have tags, it will be possible to deploy the VM on any host.
5056

5157
#. Tag setup:
58+
5259
* Host1: (no tag)
5360
* Host2: h2
5461
* Offering: h3
62+
5563
None of the hosts have compatible tags and it will not be possible to deploy a VM with the offering. However, CloudStack ignores this behavior when a host is manually selected.
5664

5765
.. _strict-host-tags:
66+
5867
Strict Host Tags
5968
-----------------
6069
During certain operations, such as changing the compute offering or starting or
@@ -96,23 +105,31 @@ Storage tags are responsible for directing volumes to compatible primary storage
96105
To explain the behavior of storage tags, some examples will be demonstrated:
97106

98107
#. Tag setup:
108+
99109
* Storage: A
100110
* Offering: A,B
111+
101112
Storage and offering accept a list of tags, with the comma (,) being their separator. Therefore, in this example, the offering has tags A and B. In this example, it will not be possible to allocate the volume, as all the offering tags must exist in the storage. Although the storage has the A tag, it does not have the B tag.
102113

103114
#. Tag setup:
115+
104116
* Storage: A,B,C,D,X
105117
* Offering: A,B,C
118+
106119
In this example, it will be possible to allocate the volume, as all the offering tags exist in the storage.
107120

108121
#. Tag setup:
122+
109123
* Storage: A, B, C
110124
* Offering: (no tag)
125+
111126
In this example, it will be possible to allocate the volume, as the offering does not have any tag requirements.
112127

113128
#. Tag setup:
129+
114130
* Storage: (no tag)
115131
* Offering: D,E
132+
116133
In this example, it will not be possible to allocate the volume, as the storage does not have tags, therefore it does not meet the offering requirements.
117134

118135
In short, if the offering has tags, the storage will need to have all the tags for the volume to be allocated. If the offering does not have tags, the volume can be allocated, regardless of whether the storage has a tag or not.

source/adminguide/networking/virtual_private_cloud_config.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ Configuring Network Access Control List
308308
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
309309

310310
.. note::
311-
Network Access Control Lists can only be created if the service
312-
"NetworkACL" is supported by the created VPC.
311+
Network Access Control Lists can only be created if the service
312+
"NetworkACL" is supported by the created VPC.
313313

314314
Define a Network Access Control List (ACL) to control incoming
315315
(ingress) and outgoing (egress) traffic between the associated Network Tier
@@ -347,14 +347,14 @@ destination" and / or "allow all ingress source" rule to the ACL.
347347
Afterwards traffic can be white- or blacklisted.
348348

349349
.. note::
350-
- ACL Rules in Cloudstack are stateful
351-
- Source / Destination CIDRs are always external Networks
352-
- ACL rules can also been seen on the virtual router of the VPC. Ingress
353-
rules are listed in the table iptables table "filter" while egress rules
354-
are placed in the "mangle" table
355-
- ACL rules for ingress and egress are not correlating. For example a
356-
egress "deny all" won't affect traffic in response to an allowed ingress
357-
connection
350+
- ACL Rules in Cloudstack are stateful
351+
- Source / Destination CIDRs are always external Networks
352+
- ACL rules can also been seen on the virtual router of the VPC. Ingress
353+
rules are listed in the table iptables table "filter" while egress rules
354+
are placed in the "mangle" table
355+
- ACL rules for ingress and egress are not correlating. For example a
356+
egress "deny all" won't affect traffic in response to an allowed ingress
357+
connection
358358

359359

360360
Creating ACL Lists

source/adminguide/networking/vnf_templates_appliances.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
1616
1717
VNF Templates and Appliances
18-
=======================
18+
============================
1919

2020
Virtualized Network Functions (VNFs) refers to virtualized software applications
2121
which offers network services, for example routers, firewalls, load balancers.
2222

2323

2424
Adding a VNF template from an URL
25-
-------
25+
-----------------------------------------------------------
2626

2727
To create a VNF appliance, user needs to register a VNF template and add VNF settings.
2828

@@ -44,7 +44,7 @@ the same page or under Network -> VNF templates.
4444

4545

4646
Updating a VM template to VNF template
47-
-------
47+
-----------------------------------------------------------
4848

4949
Users are able to update an existing VM template, which is uploaded from
5050
HTTP server or local, or created from volume, to be a VNF template.
@@ -63,7 +63,7 @@ HTTP server or local, or created from volume, to be a VNF template.
6363

6464

6565
Updating the VNF settings of a VNF template
66-
-------------------
66+
-----------------------------------------------------------
6767

6868
Users need to add the VNF nics and VNF details of the VNF templates.
6969

@@ -115,7 +115,7 @@ Users need to add the VNF nics and VNF details of the VNF templates.
115115

116116

117117
Deploying VNF appliances
118-
-------------------
118+
-----------------------------------------------------------
119119

120120
#. Log in to the CloudStack UI as an administrator or end user.
121121

@@ -147,15 +147,15 @@ Deploying VNF appliances
147147
The following network rules will be applied.
148148

149149
- If management network is an isolated network, CloudStack will acquire a public
150-
IP, enable static nat on the VNF appliance, and create firewall rules to allow
151-
traffic to ssh/http/https ports based on access_methods in VNF template details.
150+
IP, enable static nat on the VNF appliance, and create firewall rules to allow
151+
traffic to ssh/http/https ports based on access_methods in VNF template details.
152152

153153
- If management network is a shared network with security groups, CloudStack will
154-
create a new security group with rules to allow traffic to ssh/http/https ports
155-
based on access_methods in VNF template details, and assign to the VNF appliance.
154+
create a new security group with rules to allow traffic to ssh/http/https ports
155+
based on access_methods in VNF template details, and assign to the VNF appliance.
156156

157157
- If management network is a L2 network, VPC tier or Shared network without security
158-
groups, no network rules will be configured.
158+
groups, no network rules will be configured.
159159

160160

161161
#. Click on the "Launch VNF appliance" button

source/adminguide/service_offerings.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -653,22 +653,22 @@ on different types of networks in CloudStack.
653653

654654
.. cssclass:: table-striped table-bordered table-hover
655655

656-
=========================================== ===============================
657-
Networks Network Rate Is Taken from
658-
=========================================== ===============================
659-
Guest network of Virtual Router Guest Network Offering
660-
Public network of Virtual Router Guest Network Offering
661-
Storage network of Secondary Storage VM System Network Offering
662-
Management network of Secondary Storage VM System Network Offering
663-
Storage network of Console Proxy VM System Network Offering
664-
Management network of Console Proxy VM System Network Offering
665-
Storage network of Virtual Router System Network Offering
666-
Management network of Virtual Router System Network Offering
667-
Public network of Secondary Storage instance System Network Offering
668-
Public network of Console Proxy instance System Network Offering
669-
Default network of a guest instance Compute Offering
670-
Additional networks of a guest instance Corresponding Network Offerings
671-
=========================================== ===============================
656+
============================================ ===============================
657+
Networks Network Rate Is Taken from
658+
============================================ ===============================
659+
Guest network of Virtual Router Guest Network Offering
660+
Public network of Virtual Router Guest Network Offering
661+
Storage network of Secondary Storage VM System Network Offering
662+
Management network of Secondary Storage VM System Network Offering
663+
Storage network of Console Proxy VM System Network Offering
664+
Management network of Console Proxy VM System Network Offering
665+
Storage network of Virtual Router System Network Offering
666+
Management network of Virtual Router System Network Offering
667+
Public network of Secondary Storage instance System Network Offering
668+
Public network of Console Proxy instance System Network Offering
669+
Default network of a guest instance Compute Offering
670+
Additional networks of a guest instance Corresponding Network Offerings
671+
============================================ ===============================
672672

673673
A guest instance must have a default network, and can also have many
674674
additional networks. Depending on various parameters, such as the host

source/adminguide/storage.rst

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,13 @@ In order to use multiple local storage pools, you need to
171171
172172
local.storage.uuid=a43943c1-1759-4073-9db1-bc0ea19203aa,f5b1220b-4446-42dc-a872-cffd281f9f8c
173173
local.storage.path=/var/lib/libvirt/images,/var/lib/libvirt/images2
174-
#
175174
176175
#. Restart cloudstack-agent service
177176

178177
- Storage pools will be automatically created in libvirt by the CloudStack agent
179178

180179
Adding a Local Storage Pool via UI
181-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
180+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
182181

183182
When using UI, ensure that the scope of the storage is set to "Host", and
184183
ensure that the protocol is set to "Filesystem".
@@ -187,6 +186,7 @@ ensure that the protocol is set to "Filesystem".
187186

188187
Changing the Scope of the Primary Storage
189188
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
189+
190190
Scope of a Primary Storage can be changed from Zone-wide to Cluster-wide
191191
and vice versa when the Primary Storage is in Disabled state.
192192
An action button is displayed in UI for each Primary Storage in Disabled state.
@@ -276,7 +276,7 @@ templates, and ISOs.
276276

277277

278278
Setting NFS Mount Options on the Storage Pool
279-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
279+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
280280

281281
NFS mount options can be added while creating an NFS storage pool for
282282
KVM hosts. When the storage pool is mounted on the KVM hypervisor host,
@@ -393,6 +393,7 @@ under "Browser" tab for a secondary storage.
393393

394394
Read only
395395
~~~~~~~~~
396+
396397
Secondary storages can also be set to read-only in order to cordon it off
397398
from being used for storing any further Templates, Volumes and Snapshots.
398399

@@ -401,47 +402,47 @@ from being used for storing any further Templates, Volumes and Snapshots.
401402
cmk updateImageStore id=4440f406-b9b6-46f1-93a4-378a75cf15de readonly=true
402403
403404
Direct resources to a specific secondary storage
404-
~~~~~~~~~
405+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
405406

406407
By default, ACS allocates ISOs, volumes, snapshots, and templates to the freest secondary storage of the zone. In order to direct these resources to a specific secondary storage, the user can utilize the functionality of the dynamic secondary storage selectors using heuristic rules. This functionality utilizes JavaScript rules, defined by the user, to direct these resources to a specific secondary storage. When creating the heuristic rule, the script will have access to some preset variables with information about the secondary storage in the zone, about the resource the rule will be applied upon, and about the account that triggered the allocation. These variables are presented in the table below:
407408

408409
+-----------------------------------+-----------------------------------+
409410
| Resource | Variables |
410411
+===================================+===================================+
411412
| Secondary Storage | ``id`` |
412-
| +-----------------------------------|
413+
| +-----------------------------------+
413414
| | ``name`` |
414-
| +-----------------------------------|
415+
| +-----------------------------------+
415416
| | ``usedDiskSize`` |
416-
| +-----------------------------------|
417+
| +-----------------------------------+
417418
| | ``totalDiskSize`` |
418-
| +-----------------------------------|
419+
| +-----------------------------------+
419420
| | ``protocol`` |
420421
+-----------------------------------+-----------------------------------+
421422
| Snapshot | ``size`` |
422-
| +-----------------------------------|
423+
| +-----------------------------------+
423424
| | ``hypervisorType`` |
424-
| +-----------------------------------|
425+
| +-----------------------------------+
425426
| | ``name`` |
426427
+-----------------------------------+-----------------------------------+
427428
| ISO/Template | ``format`` |
428-
| +-----------------------------------|
429+
| +-----------------------------------+
429430
| | ``hypervisorType`` |
430-
| +-----------------------------------|
431+
| +-----------------------------------+
431432
| | ``templateType`` |
432-
| +-----------------------------------|
433+
| +-----------------------------------+
433434
| | ``name`` |
434435
+-----------------------------------+-----------------------------------+
435436
| Volume | ``size`` |
436-
| +-----------------------------------|
437+
| +-----------------------------------+
437438
| | ``format`` |
438439
+-----------------------------------+-----------------------------------+
439440
| Account | ``id`` |
440-
| +-----------------------------------|
441+
| +-----------------------------------+
441442
| | ``name`` |
442-
| +-----------------------------------|
443+
| +-----------------------------------+
443444
| | ``domain.id`` |
444-
| +-----------------------------------|
445+
| +-----------------------------------+
445446
| | ``domain.name`` |
446447
+-----------------------------------+-----------------------------------+
447448

@@ -722,7 +723,7 @@ may take several minutes for the volume to be moved to the new Instance.
722723

723724

724725
Instance Storage Migration
725-
~~~~~~~~~~~~~~~~~~~~
726+
~~~~~~~~~~~~~~~~~~~~~~~~~~
726727

727728
Supported in XenServer, KVM, and VMware.
728729

@@ -1099,6 +1100,7 @@ API output bellow.
10991100
"diskkbsread": 343124,
11001101
"diskkbswrite": 217619,
11011102
...
1103+
11021104
Bytes read/write, as well as the total IO/s, are exposed via UI, as shown in the image below.
11031105
11041106
|volume-metrics.png|
@@ -1157,7 +1159,7 @@ Following is the example for checkVolume API usage and the result in the volume
11571159
11581160
11591161
Importing and Unmanaging Volumes from Storage Pools
1160-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1162+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11611163
11621164
Since Apache CloudStack 4.19.1.0, importing and unmanaging volumes from primary storage pools are supported.
11631165
@@ -1526,7 +1528,7 @@ Deleting objects from a bucket
15261528
2. Click on the |delete-button.png| button to delete the selected files from the bucket.
15271529
15281530
Shared FileSystems
1529-
---------------
1531+
------------------
15301532
15311533
CloudStack offers fully managed NFS Shared FileSystems to all users.
15321534
This section gives technical details on how to create/manage a Shared FileSystem
@@ -1536,7 +1538,7 @@ using basic lifecycle operations and also some implementation details.
15361538
This feature is available only on advanced zones without security groups.
15371539
15381540
Creating a New Shared FileSystem
1539-
~~~~~~~~~~~~~~~~~~~~~~~~~
1541+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15401542
15411543
#. Log in to the CloudStack UI as a user or administrator.
15421544
@@ -1600,7 +1602,8 @@ Supported lifecycle operations are :
16001602
16011603
16021604
Shared FileSystem Instance
1603-
~~~~~~~~~~~~~~
1605+
~~~~~~~~~~~~~~~~~~~~~~~~~~
1606+
16041607
The Shared FileSystem Instance is stateless and HA enabled. A new instance is deployed and will start
16051608
serving the NFS share if the host or VM goes down.
16061609
The VM is installed with the SystemVM template which is also used by the CPVM and SSVM.
@@ -1613,12 +1616,14 @@ required during normal operations.
16131616
16141617
Service Offering
16151618
~~~~~~~~~~~~~~~~
1619+
16161620
There are two global settings that control what should be the minimum RAM size and minimum
16171621
CPU count for the Shared FileSystem Instance : 'sharedfsvm.min.cpu.count' and 'sharedfsvm.min.ram.size`.
16181622
Only those offerings which meet these settings and have HA enabled are shown in the create form.
16191623
16201624
Shared FileSystem Data Volume
1621-
~~~~~~~~~~~~~~~~~~~~~~
1625+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1626+
16221627
The data volume is also visible to the users. It is recommended to use the Shared FileSystem UI/API to
16231628
manage the data but users or admin can perform actions directly on the data volume or the root volume
16241629
as well if they wish. Attaching and detaching a disk is not allowed on a Shared FileSystem Instance.

0 commit comments

Comments
 (0)