diff --git a/manifests/backend/iscsi.pp b/manifests/backend/iscsi.pp
index 9c381a2a..7d1684b1 100644
--- a/manifests/backend/iscsi.pp
+++ b/manifests/backend/iscsi.pp
@@ -104,15 +104,13 @@ define cinder::backend::iscsi (
         'tag'    => 'cinder-support-package',
       })
 
-      if($::osfamily == 'RedHat') {
-        ensure_resource('file_line', "cinder include ${volumes_dir}", {
-          'path'    => '/etc/tgt/targets.conf',
-          'line'    => "include ${volumes_dir}/*",
-          'match'   => '#?include /',
-          'require' => Anchor['cinder::install::end'],
-          'notify'  => Anchor['cinder::service::begin'],
-        })
-      }
+      ensure_resource('file_line', "cinder include ${volumes_dir}", {
+        'path'    => '/etc/tgt/targets.conf',
+        'line'    => "include ${volumes_dir}/*",
+        'match'   => '#?include /',
+        'require' => Anchor['cinder::install::end'],
+        'notify'  => Anchor['cinder::service::begin'],
+      })
 
       ensure_resource('service', 'tgtd', {
         'ensure' => running,
diff --git a/releasenotes/notes/bug-1986518-2ed0ab4ef3248cd8.yaml b/releasenotes/notes/bug-1986518-2ed0ab4ef3248cd8.yaml
new file mode 100644
index 00000000..ddd20906
--- /dev/null
+++ b/releasenotes/notes/bug-1986518-2ed0ab4ef3248cd8.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    `Bug #1986518 <https://bugs.launchpad.net/puppet-cinder/+bug/1986518>`_:
+    The ``cinder::backend::iscsi`` defined resource type now modifies
+    the ``/etc/tgt/targets.conf`` file in Ubuntu and Debian, so that cinder can
+    set up iscsi targets correctly.
diff --git a/spec/defines/cinder_backend_iscsi_spec.rb b/spec/defines/cinder_backend_iscsi_spec.rb
index 29d0c99b..c6153a64 100644
--- a/spec/defines/cinder_backend_iscsi_spec.rb
+++ b/spec/defines/cinder_backend_iscsi_spec.rb
@@ -38,6 +38,10 @@ describe 'cinder::backend::iscsi' do
         is_expected.to contain_cinder_config('hippo/volumes_dir').with_value('/var/lib/cinder/volumes')
         is_expected.to contain_cinder_config('hippo/target_protocol').with_value('<SERVICE DEFAULT>')
       }
+      it { is_expected.to contain_file_line('cinder include /var/lib/cinder/volumes').with(
+        :line => 'include /var/lib/cinder/volumes/*',
+        :path => '/etc/tgt/targets.conf'
+      )}
     end
 
     context 'with iser protocol' do
@@ -54,6 +58,10 @@ describe 'cinder::backend::iscsi' do
       end
 
       it { is_expected.to contain_cinder_config('hippo/volumes_dir').with_value('/etc/cinder/volumes') }
+      it { is_expected.to contain_file_line('cinder include /etc/cinder/volumes').with(
+        :line => 'include /etc/cinder/volumes/*',
+        :path => '/etc/tgt/targets.conf'
+      )}
     end
 
     context 'iscsi backend with cinder type' do
@@ -78,13 +86,6 @@ describe 'cinder::backend::iscsi' do
     end
   end
 
-  shared_examples 'cinder::backend::iscsi on RedHat' do
-    it { is_expected.to contain_file_line('cinder include /var/lib/cinder/volumes').with(
-      :line => 'include /var/lib/cinder/volumes/*',
-      :path => '/etc/tgt/targets.conf'
-    )}
-  end
-
   on_supported_os({
     :supported_os => OSDefaults.get_supported_os
   }).each do |os,facts|
@@ -94,10 +95,6 @@ describe 'cinder::backend::iscsi' do
       end
 
       it_behaves_like 'cinder::backend::iscsi'
-
-      if facts[:osfamily] == 'RedHat'
-        it_behaves_like 'cinder::backend::iscsi on RedHat'
-      end
     end
   end
 end