diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-09 12:42:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-09 12:42:53 +0000 |
| commit | c3918f50babc74090d0289ce152e146c780a21cf (patch) | |
| tree | e4b17c584ae333163acd0e2a9ff0dd788dd6e230 | |
| parent | 2cc592d29d932e64708e20b8ff10f30c80c99249 (diff) | |
| parent | 7f2bca677bbffdd1a3031709fcc9d6f0bac48bb7 (diff) | |
Merge "Change the CinderISCSIHelper to lioadm"
| -rw-r--r-- | overcloud.yaml | 2 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 2 | ||||
| -rw-r--r-- | puppet/controller.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index 343b1bc2..106bce95 100644 --- 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 09c4d3e3..0c22b575 100644 --- 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 c97012d7..370d6e63 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -61,7 +61,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: |