1. devstack
  2. Commit f63ddd609f8ba0c6000d7d07074dc64232830351
Browse code

Replace depricated iscsi_helper with target_helper

Cinder change I5231f8fe3399deb9c57e6efb121d0d008dc9c7f4
replaces iscsi_helper with more general one.



Change-Id: I49fe0365b170e5a5b0449d80003bcf970e4c191d

Lenny Verkhovsky authored on 2018/02/25 23:48:05
Showing 3 changed files
lib/cinder
History View file @ f63ddd6
... ... 
@@ -101,7 +101,7 @@ CINDER_PERIODIC_INTERVAL=${CINDER_PERIODIC_INTERVAL:-60}
101 101 
 if is_fedora; then
102 102 
     CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm}
103 103 
     if [[ ${CINDER_ISCSI_HELPER} != "lioadm" ]]; then
104 
-        die "lioadm is the only valid Cinder iscsi_helper config on this platform"
104 
+        die "lioadm is the only valid Cinder target_helper config on this platform"
105 105 
     fi
106 106 
 else
107 107 
     CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-tgtadm}
... ... 
@@ -230,7 +230,7 @@ function configure_cinder {
230 230 
     iniset $CINDER_CONF DEFAULT auth_strategy keystone
231 231 
     iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
232 232
233 
-    iniset $CINDER_CONF DEFAULT iscsi_helper "$CINDER_ISCSI_HELPER"
233 
+    iniset $CINDER_CONF DEFAULT target_helper "$CINDER_ISCSI_HELPER"
234 234 
     iniset $CINDER_CONF database connection `database_connection_url cinder`
235 235 
     iniset $CINDER_CONF DEFAULT api_paste_config $CINDER_API_PASTE_INI
236 236 
     iniset $CINDER_CONF DEFAULT rootwrap_config "$CINDER_CONF_DIR/rootwrap.conf"
lib/cinder_backends/fake_gate
History View file @ f63ddd6
... ... 
@@ -50,7 +50,7 @@ function configure_cinder_backend_lvm {
50 50 
     iniset $CINDER_CONF $be_name volume_backend_name $be_name
51 51 
     iniset $CINDER_CONF $be_name volume_driver "cinder.tests.fake_driver.FakeGateDriver"
52 52 
     iniset $CINDER_CONF $be_name volume_group $VOLUME_GROUP_NAME-$be_name
53 
-    iniset $CINDER_CONF $be_name iscsi_helper "$CINDER_ISCSI_HELPER"
53 
+    iniset $CINDER_CONF $be_name target_helper "$CINDER_ISCSI_HELPER"
54 54 
     iniset $CINDER_CONF $be_name lvm_type "$CINDER_LVM_TYPE"
55 55
56 56 
     if [[ "$CINDER_VOLUME_CLEAR" == "non" ]]; then
lib/cinder_backends/lvm
History View file @ f63ddd6
... ... 
@@ -50,7 +50,7 @@ function configure_cinder_backend_lvm {
50 50 
     iniset $CINDER_CONF $be_name volume_backend_name $be_name
51 51 
     iniset $CINDER_CONF $be_name volume_driver "cinder.volume.drivers.lvm.LVMVolumeDriver"
52 52 
     iniset $CINDER_CONF $be_name volume_group $VOLUME_GROUP_NAME-$be_name
53 
-    iniset $CINDER_CONF $be_name iscsi_helper "$CINDER_ISCSI_HELPER"
53 
+    iniset $CINDER_CONF $be_name target_helper "$CINDER_ISCSI_HELPER"
54 54 
     iniset $CINDER_CONF $be_name lvm_type "$CINDER_LVM_TYPE"
55 55
56 56 
 }