From 2761f8b1b9e16dfaee5fbaab5a29acfaa039b8b1 Mon Sep 17 00:00:00 2001
From: Alan Bishop <abishop@redhat.com>
Date: Thu, 3 May 2018 08:58:19 -0400
Subject: [PATCH] Revert "Restore iscsi loopback LVM volume group on startup"

This reverts commit b8f15088b5c3b70ae2c12ecd8185064a0159a6e1.

The original commit failed to fully address the problem it tried
to solve, and is causing additional problems.

Closes-Bug: #1768833
Change-Id: I9126e5acaf16a39528c65e756eb475dc62e1ab40
Conflicts:
	manifests/setup_test_volume.pp
---
 manifests/setup_test_volume.pp                | 8 --------
 spec/classes/cinder_setup_test_volume_spec.rb | 4 ----
 2 files changed, 12 deletions(-)

diff --git a/manifests/setup_test_volume.pp b/manifests/setup_test_volume.pp
index 01ccb33f..fda6083e 100644
--- a/manifests/setup_test_volume.pp
+++ b/manifests/setup_test_volume.pp
@@ -59,12 +59,4 @@ class cinder::setup_test_volume(
     unless      => "vgdisplay | grep ${volume_name}",
     refreshonly => true,
   }
-
-  # Ensure the loopback device and volume group are restored if the system
-  # were to reboot.
-  -> exec { "losetup -f ${volume_path}/${volume_name} && udevadm settle && vgchange -a y ${volume_name}":
-    path   => ['/bin','/usr/bin','/sbin','/usr/sbin'],
-    unless => "losetup -l | grep ${volume_path}/${volume_name}",
-    before => Anchor['cinder::service::begin'],
-  }
 }
diff --git a/spec/classes/cinder_setup_test_volume_spec.rb b/spec/classes/cinder_setup_test_volume_spec.rb
index 3d67db84..b62f6282 100644
--- a/spec/classes/cinder_setup_test_volume_spec.rb
+++ b/spec/classes/cinder_setup_test_volume_spec.rb
@@ -20,8 +20,4 @@ describe 'cinder::setup_test_volume' do
         :mode => '0640'
     )
   end
-
-  it 'should restore loopback device and volume group' do
-    is_expected.to contain_exec('losetup -f /var/lib/cinder/cinder-volumes && udevadm settle && vgchange -a y cinder-volumes')
-  end
 end