Re: [libvirt] [PATCH 1/6] docs: Remove unnecessary example for iscsi disk type='volume'

[Peter Krempa]

On Thu, Sep 14, 2017 at 14:03:05 -0400, John Ferlan wrote:
> Alter the example to remove the  from:
> 
>   
> 
> 
> 
>   
> 
> 
>   
> 
> and
> 
>   
> 
> 
> 
>   
> 
> 
>   
> 
> The reality is, it's not even used. For a  the authdef
> from the storage source pool will supercede whatever is in the 
> definition during virStorageTranslateDiskSourcePool processing. In fact,
> if the pool doesn't have/need authentication, then the authdef would
> be removed anyway as the storage pool would be handling things.
> 
> The "proof" for this is in the adjustment to the test to add an
>  for a disk. The resulting .args file won't add what normally
> would be added "myname:encodedpassword@" prior to the hostname in
> the IQN (e.g. iscsi://myname:encodedpassw...@iscsi.example.org:3260/...
> 
> Signed-off-by: John Ferlan 
> ---
>  docs/formatdomain.html.in   |  6 --
>  .../qemuxml2argv-disk-source-pool-mode.args |  3 +++
>  .../qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml | 13 
> +
>  .../qemuxml2xmlout-disk-source-pool-mode.xml| 13 
> +
>  4 files changed, 29 insertions(+), 6 deletions(-)

ACK


signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 1/6] docs: Remove unnecessary example for iscsi disk type='volume'

[John Ferlan]

Alter the example to remove the  from:

  



  


  

and

  



  


  

The reality is, it's not even used. For a  the authdef
from the storage source pool will supercede whatever is in the 
definition during virStorageTranslateDiskSourcePool processing. In fact,
if the pool doesn't have/need authentication, then the authdef would
be removed anyway as the storage pool would be handling things.

The "proof" for this is in the adjustment to the test to add an
 for a disk. The resulting .args file won't add what normally
would be added "myname:encodedpassword@" prior to the hostname in
the IQN (e.g. iscsi://myname:encodedpassw...@iscsi.example.org:3260/...

Signed-off-by: John Ferlan 
---
 docs/formatdomain.html.in   |  6 --
 .../qemuxml2argv-disk-source-pool-mode.args |  3 +++
 .../qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml | 13 +
 .../qemuxml2xmlout-disk-source-pool-mode.xml| 13 +
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 8ca7637a4..3b78bbeb8 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2385,17 +2385,11 @@
   disk type='volume' device='disk'
 driver name='qemu' type='raw'/
 source pool='iscsi-pool' volume='unit:0:0:1' mode='host'/
-auth username='myuser'
-  secret type='iscsi' usage='libvirtiscsi'/
-/auth
 target dev='vdb' bus='virtio'/
   /disk
   disk type='volume' device='disk'
 driver name='qemu' type='raw'/
 source pool='iscsi-pool' volume='unit:0:0:2' mode='direct'/
-auth username='myuser'
-  secret type='iscsi' usage='libvirtiscsi'/
-/auth
 target dev='vdc' bus='virtio'/
   /disk
   disk type='file' device='disk'
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args 
b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
index 7cda627f2..5b4e65e10 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args
@@ -28,4 +28,7 @@ id=drive-ide0-0-2,readonly=on \
 -device ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 \
 -drive file=/tmp/idedisk.img,format=raw,if=none,id=drive-ide0-0-3 \
 -device ide-drive,bus=ide.0,unit=3,drive=drive-ide0-0-3,id=ide0-0-3 \
+-drive file=iscsi://iscsi.example.com:3260/demo-target/3,if=none,media=cdrom,\
+id=drive-ide0-0-4,readonly=on \
+-device ide-drive,bus=ide.0,unit=4,drive=drive-ide0-0-4,id=ide0-0-4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml 
b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml
index eaf411c8b..3f5a2d524 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.xml
@@ -39,6 +39,19 @@
   
   
 
+
+  
+
+  
+  
+
+  system_u:system_r:public_content_t:s0
+
+  
+  
+  
+  
+
 
 
 
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml 
b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml
index 1ca56fbb9..a14ed7b97 100644
--- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml
@@ -39,6 +39,19 @@
   
   
 
+
+  
+
+  
+  
+
+  system_u:system_r:public_content_t:s0
+
+  
+  
+  
+  
+
 
   
 
-- 
2.13.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list