Skip to content

Commit f6d2494

Browse files
committed
Merge branch '4.19'
2 parents 5640e12 + 81d23ed commit f6d2494

18 files changed

+1222
-29
lines changed

source/_global.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525

2626
.. Latest version systemvm template name
2727
28-
.. |sysvm64-version| replace:: 4.19.0
29-
.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.19.0
30-
.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.19.0
31-
.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.19.0
32-
.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.19.0
33-
.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.19.0
28+
.. |sysvm64-version| replace:: 4.19.1
29+
.. |sysvm64-name-xen| replace:: systemvm-xenserver-4.19.1
30+
.. |sysvm64-name-kvm| replace:: systemvm-kvm-4.19.1
31+
.. |sysvm64-name-vmware| replace:: systemvm-vmware-4.19.1
32+
.. |sysvm64-name-hyperv| replace:: systemvm-hyperv-4.19.1
33+
.. |sysvm64-name-ovm| replace:: systemvm-ovm-4.19.1
3434

3535
.. Latest version systemvm template URL
36-
.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.0-xen.vhd.bz2
37-
.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.0-kvm.qcow2.bz2
38-
.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.0-vmware.ova
39-
.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.0-hyperv.vhd.zip
40-
.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.0-ovm.raw.bz2
36+
.. |sysvm64-url-xen| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.1-xen.vhd.bz2
37+
.. |sysvm64-url-kvm| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.1-kvm.qcow2.bz2
38+
.. |sysvm64-url-vmware| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.1-vmware.ova
39+
.. |sysvm64-url-hyperv| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.1-hyperv.vhd.zip
40+
.. |sysvm64-url-ovm| replace:: http://download.cloudstack.org/systemvm/4.19/systemvmtemplate-4.19.1-ovm.raw.bz2
4141

4242
.. Images
4343
41.4 KB
Loading
33.1 KB
Loading
184 KB
Loading
54.5 KB
Loading
68.7 KB
Loading
55.6 KB
Loading

source/adminguide/hosts.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,10 @@ To change a Node's password:
244244

245245
.. code:: bash
246246
247-
java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.0.jar \
248-
org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI \
249-
encrypt.sh input="newrootpassword" \
250-
password="databasekey" \
251-
verbose=false
247+
java -classpath /usr/share/cloudstack-common/lib/cloudstack-utils.jar \
248+
com.cloud.utils.crypt.EncryptionCLI \
249+
-p databasekey \
250+
-i newrootpassword
252251
253252
#. Get the list of host IDs for the host in the cluster where you are
254253
changing the password. You will need to access the database to

source/adminguide/management.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ add the encrypted password to
181181

182182
.. code:: bash
183183
184-
# java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar \ org.jasypt.intf.cli.JasyptPBEStringEncryptionCLI encrypt.sh \ input="newpassword123" password="`cat /etc/cloudstack/management/key`" \ verbose=false
184+
# java -classpath /usr/share/cloudstack-common/lib/cloudstack-utils.jar com.cloud.utils.crypt.EncryptionCLI -p `cat /etc/cloudstack/management/key` -i newpassword123
185185
186186
187187
File encryption type

source/adminguide/storage.rst

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,43 @@ ensure that the protocol is set to "Filesystem".
185185

186186
|adding-local-pool-via-ui.png|
187187

188+
Changing the Scope of the Primary Storage
189+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
190+
Scope of a Primary Storage can be changed from Zone-wide to Cluster-wide
191+
and vice versa when the Primary Storage is in Disabled state.
192+
An action button is displayed in UI for each Primary Storage in Disabled state.
193+
194+
|change-storage-pool-scope-via-ui.png|
195+
196+
Scope change from Cluster to Zone will connect the Primary Storage to all Hosts
197+
of the zone running the same hypervisor as set on the storage pool.
198+
199+
|change-storage-pool-scope-to-zone.png|
200+
201+
Scope change from Zone to Cluster will disconnect the Primary Storage from all
202+
Hosts that were previously connected to the Primary Storage and are not a part
203+
of the specified Cluster. So, if there are running VMs on such hosts using this
204+
Storage Pool, they cannot be disconnected from the hosts. In this case the Scope
205+
change operation will error out.
206+
The user VMs need to be stopped or migrated and system VMs need to be destroyed
207+
while the primary Storage is disabled, before attempting the operation again.
208+
listAffectedVmsForstorageScopeChange API can be used to get the list of all such VMs.
209+
210+
This might be a long running operation depending on how many hosts are there
211+
in the zone which need to be connected or disconnected to the storage pool.
212+
213+
This feature is tested and supported for the following hypervisor and storage
214+
combinations:
215+
216+
- KVM with NFS
217+
218+
- KVM wite CEPH/RBD
219+
220+
- VMWare with NFS
221+
222+
It is possible to use this functionality with other configurations but some
223+
manual intervention might be needed by the Administrator to make it work.
224+
188225
Storage Tags
189226
~~~~~~~~~~~~
190227

@@ -237,6 +274,73 @@ templates, and ISOs.
237274
.. note::
238275
If files or folders are not associated with a cloudstack resource, it doesn't mean that they are not used by cloudstack.
239276

277+
278+
Setting NFS Mount Options on the Storage Pool
279+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
280+
281+
NFS mount options can be added while creating an NFS storage pool for
282+
KVM hosts. When the storage pool is mounted on the KVM hypervisor host,
283+
these options will be used. Options currently tested and supported are
284+
`vers` and `nconnect`.
285+
286+
Although it depends on the NFS server, but commonly supported `vers` values
287+
are `3` for NFSv3 and minor versions `4.0, 4.1 and 4.2` for NFSv4.
288+
`nconnect` values can range from 1 to 16.
289+
290+
Administrator can give the NFS mount options while adding a Primary Storage
291+
from the Create Zone Wizard as well as the Add Primary Storage form.
292+
|nfs-mount-options-create-zone-wizard.png|
293+
|nfs-mount-options-add-primary-storage.png|
294+
295+
NFS mount options can be changed on a pre-existing Storage Pool in maintenance
296+
mode using the Edit Primary Storage form. Running VMs using volumes in the
297+
Storage Pool will either be stopped or the volumes would be migrated to other
298+
available pools upon enabling maintenance mode.
299+
Storage Pool will be unmounted and mounted again on the KVM hosts using the
300+
new options upon cancelling the maintenance mode.
301+
|nfs-mount-options-edit-primary-storage.png|
302+
303+
Mount failing due to an incorrect mount option
304+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
305+
Add Storage Pool will fail with the error ``An incorrect mount option was specified``.
306+
307+
In the Update storage pool case, cancel maintenance will throw the above error.
308+
The Administrator should set the correct mount option and cancel the maintenance mode again.
309+
310+
311+
Version Requirements
312+
^^^^^^^^^^^^^^^^^^^^
313+
This feature needs libvirt version 5.1.0 and above on the KVM hosts.
314+
315+
The `nconnect` mount option exists in all Linux distributions with kernel 5.3 or higher
316+
317+
A note on the `nconnect` option
318+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
319+
320+
This option defines the count of TCP connections that the client makes
321+
to the NFS server. The `nconnect` setting is applied only during the
322+
first mount process to the particular NFS server for a given NFS version.
323+
324+
If the same client executes the mount command again to the same NFS server using
325+
the same version, it will get the same `nconnect` value as the first mount.
326+
All mount point to the same server at a given version share the same number
327+
of TCP connections. To change the `nconnect` settings all the such mount points
328+
need to be unmounted and then mounted again with the new `nconnect` value.
329+
330+
So, from CloudStack’s perspective also, the first storage pool created from an
331+
NFS server will set the `nconnect` setting on the hypervisor host corresponding
332+
to the server. Specifying a different `nconnect` mount option while creating a
333+
new storage pool from the same server will not change the `nconnect` setting on the host.
334+
335+
Similarly if there is only one pre-existing storage pool from a give NFS server
336+
mounted on the host, modifying the `nconnect` mount option via CloudStack will
337+
change the `nconnect` setting on that host. If there are more than one storage pools
338+
from the same server mounted on a host. Changing the `nconnect` mount option on one
339+
of the storage pools via CloudStack will not do anything. To change the `nconnect`
340+
setting on the host, after modifying `nconnect` mount option on all storage pools,
341+
the host needs to be restarted.
342+
343+
240344
Secondary Storage
241345
-----------------
242346

@@ -1415,10 +1519,20 @@ Deleting objects from a bucket
14151519
:alt: Upload button
14161520
.. |adding-local-pool-via-ui.png| image:: /_static/images/adding-local-pool-via-ui.png
14171521
:alt: Adding Local Storage Pool via UI
1522+
.. |change-storage-pool-scope-via-ui.png| image:: /_static/images/change-storage-pool-scope-via-ui.png
1523+
:alt: Change Primary Storage Scope via UI
1524+
.. |change-storage-pool-scope-to-zone.png| image:: /_static/images/change-storage-pool-scope-to-zone.png
1525+
:alt: Change Primary Storage Scope to Zone via UI
14181526
.. |list-unmanaged-managed-volumes.png| image:: /_static/images/list-unmanaged-managed-volumes.png
14191527
:alt: List of Unmanaged and Managed Volumes
14201528
.. |import-volume.png| image:: /_static/images/import-volume.png
14211529
:alt: Import Volume
14221530
.. |unmanage-volume.png| image:: /_static/images/unmanage-volume.png
14231531
:alt: Unmanage Volume
1532+
.. |nfs-mount-options-create-zone-wizard.png| image:: /_static/images/nfs-mount-options-create-zone-wizard.png
1533+
:alt: NFS mount options in create Zone wizard
1534+
.. |nfs-mount-options-add-primary-storage.png| image:: /_static/images/nfs-mount-options-add-primary-storage.png
1535+
:alt: NFS mount options in add Primary Storage
1536+
.. |nfs-mount-options-edit-primary-storage.png| image:: /_static/images/nfs-mount-options-edit-primary-storage.png
1537+
:alt: NFS mount options in edit Primary Storage
14241538

0 commit comments

Comments
 (0)