From f63ddd609f8ba0c6000d7d07074dc64232830351 Mon Sep 17 00:00:00 2001 From: Lenny Verkhovsky Date: Sun, 25 Feb 2018 14:48:05 +0000 Subject: [PATCH] Replace depricated iscsi_helper with target_helper Cinder change I5231f8fe3399deb9c57e6efb121d0d008dc9c7f4 replaces iscsi_helper with more general one. Change-Id: I49fe0365b170e5a5b0449d80003bcf970e4c191d --- lib/cinder | 4 ++-- lib/cinder_backends/fake_gate | 2 +- lib/cinder_backends/lvm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cinder b/lib/cinder index 75486adda5..a1d68712b6 100644 --- a/lib/cinder +++ b/lib/cinder @@ -101,7 +101,7 @@ CINDER_PERIODIC_INTERVAL=${CINDER_PERIODIC_INTERVAL:-60} if is_fedora; then CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm} if [[ ${CINDER_ISCSI_HELPER} != "lioadm" ]]; then - die "lioadm is the only valid Cinder iscsi_helper config on this platform" + die "lioadm is the only valid Cinder target_helper config on this platform" fi else CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-tgtadm} @@ -230,7 +230,7 @@ function configure_cinder { iniset $CINDER_CONF DEFAULT auth_strategy keystone iniset $CINDER_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL - iniset $CINDER_CONF DEFAULT iscsi_helper "$CINDER_ISCSI_HELPER" + iniset $CINDER_CONF DEFAULT target_helper "$CINDER_ISCSI_HELPER" iniset $CINDER_CONF database connection `database_connection_url cinder` iniset $CINDER_CONF DEFAULT api_paste_config $CINDER_API_PASTE_INI iniset $CINDER_CONF DEFAULT rootwrap_config "$CINDER_CONF_DIR/rootwrap.conf" diff --git a/lib/cinder_backends/fake_gate b/lib/cinder_backends/fake_gate index 6b1f848790..3ffd9a6785 100644 --- a/lib/cinder_backends/fake_gate +++ b/lib/cinder_backends/fake_gate @@ -50,7 +50,7 @@ function configure_cinder_backend_lvm { iniset $CINDER_CONF $be_name volume_backend_name $be_name iniset $CINDER_CONF $be_name volume_driver "cinder.tests.fake_driver.FakeGateDriver" iniset $CINDER_CONF $be_name volume_group $VOLUME_GROUP_NAME-$be_name - iniset $CINDER_CONF $be_name iscsi_helper "$CINDER_ISCSI_HELPER" + iniset $CINDER_CONF $be_name target_helper "$CINDER_ISCSI_HELPER" iniset $CINDER_CONF $be_name lvm_type "$CINDER_LVM_TYPE" if [[ "$CINDER_VOLUME_CLEAR" == "non" ]]; then diff --git a/lib/cinder_backends/lvm b/lib/cinder_backends/lvm index 03e188029f..497081c9e4 100644 --- a/lib/cinder_backends/lvm +++ b/lib/cinder_backends/lvm @@ -50,7 +50,7 @@ function configure_cinder_backend_lvm { iniset $CINDER_CONF $be_name volume_backend_name $be_name iniset $CINDER_CONF $be_name volume_driver "cinder.volume.drivers.lvm.LVMVolumeDriver" iniset $CINDER_CONF $be_name volume_group $VOLUME_GROUP_NAME-$be_name - iniset $CINDER_CONF $be_name iscsi_helper "$CINDER_ISCSI_HELPER" + iniset $CINDER_CONF $be_name target_helper "$CINDER_ISCSI_HELPER" iniset $CINDER_CONF $be_name lvm_type "$CINDER_LVM_TYPE" }