diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ce46f061d8678c332514f715bab8c02e5b0da670..889e721b9c592cd28268536726eccc1ed21ea151 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2151,7 +2151,7 @@ rbd monitor servers of RBD one or more - 6789 + librados default sheepdog diff --git a/docs/storage.html.in b/docs/storage.html.in index 6c8222abe8d08ea2a2527bc54334de2ed3ea4506..1f0133035628e6cd526ea3b5eefee71017029729 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -550,7 +550,9 @@ backend supports cephx authentication for communication with the Ceph cluster. Storing the cephx authentication key is done with the libvirt secret mechanism. The UUID in the example pool input - refers to the UUID of the stored secret. + refers to the UUID of the stored secret.
+ The port attribute for a Ceph monitor does not have to be provided. + If not provided librados will use the default Ceph monitor port. Since 0.9.13

@@ -560,8 +562,8 @@ <name>myrbdpool</name> <source> <name>rbdpool</name> - <host name='1.2.3.4' port='6789'/> - <host name='my.ceph.monitor' port='6789'/> + <host name='1.2.3.4'/> + <host name='my.ceph.monitor'/> <host name='third.ceph.monitor' port='6789'/> <auth username='admin' type='ceph'> <secret uuid='2ec115d7-3a88-3ceb-bc12-0ac909a6fd87'/> diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 8dcb9be8991f30e8358a2dff1b7efb336e1fafc3..e20a54d35d40d07d29cd623176f384453f69e724 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -173,7 +173,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr, for (i = 0; i < source->nhost; i++) { if (source->hosts[i].name != NULL && !source->hosts[i].port) { - virBufferAsprintf(&mon_host, "%s:6789,", + virBufferAsprintf(&mon_host, "%s,", source->hosts[i].name); } else if (source->hosts[i].name != NULL && source->hosts[i].port) { diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 2aa1d90d65817ca2c46aaf23250ab4cc85699195..101070f95ae8900b1f9950bdab2e786c2e274f81 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2245,9 +2245,6 @@ virStorageSourceRBDAddHost(virStorageSourcePtr src, port += skip; if (VIR_STRDUP(src->hosts[src->nhosts - 1].port, port) < 0) goto error; - } else { - if (VIR_STRDUP(src->hosts[src->nhosts - 1].port, "6789") < 0) - goto error; } parts = virStringSplit(hostport, "\\:", 0);