Change the CinderISCSIHelper to lioadm

Previously we used to always set CinderISCSIHelper to lioadm from
the client. With [1] we aim at cleaning up the client from any
default so this change move the actual default into the templates.

1. Iabc94ad1cce6f1744429aca9f866a59a698f5680

Change-Id: I662e4b0e3cf909ec2583d087ca1d246715caf0f7
Related-Bug: 1554564

diff --git a/overcloud.yaml b/overcloud.yaml
index 343b1bc..106bce9 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -366,7 +366,7 @@ parameters:
     type: string
     hidden: true
   CinderISCSIHelper:
-    default: tgtadm
+    default: lioadm
     description: The iSCSI helper to use with cinder.
     type: string
   ControllerCount:

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 09c4d3e..0c22b57 100644 (file)
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -9,7 +9,7 @@ parameters:
     description: Whether to enable or not the Iscsi backend for Cinder
     type: boolean
   CinderISCSIHelper:
-    default: tgtadm
+    default: lioadm
     description: The iSCSI helper to use with cinder.
     type: string
   CinderLVMLoopDeviceSize:

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 494347f..f17385f 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -57,7 +57,7 @@ parameters:
     description: Whether to enable or not the Rbd backend for Cinder
     type: boolean
   CinderISCSIHelper:
-    default: tgtadm
+    default: lioadm
     description: The iSCSI helper to use with cinder.
     type: string
   CinderLVMLoopDeviceSize: