diff --git a/manifests/cron/archive_deleted_rows.pp b/manifests/cron/archive_deleted_rows.pp
index ccebeca39..8cd3e45d0 100644
--- a/manifests/cron/archive_deleted_rows.pp
+++ b/manifests/cron/archive_deleted_rows.pp
@@ -49,6 +49,10 @@
 #    (optional) Path to file to which rows should be archived
 #    Defaults to '/var/log/nova/nova-rowsflush.log'.
 #
+#  [*until_complete*]
+#    (optional) Adds --until_complete to the archive command
+#    Defaults to false.
+#
 class nova::cron::archive_deleted_rows (
   $minute      = 1,
   $hour        = 0,
@@ -57,13 +61,18 @@ class nova::cron::archive_deleted_rows (
   $weekday     = '*',
   $max_rows    = '100',
   $user        = 'nova',
-  $destination = '/var/log/nova/nova-rowsflush.log'
+  $destination = '/var/log/nova/nova-rowsflush.log',
+  $until_complete = false,
 ) {
 
   include ::nova::deps
 
+  if $until_complete {
+    $until_complete_real = '--until_complete'
+  }
+
   cron { 'nova-manage db archive_deleted_rows':
-    command     => "nova-manage db archive_deleted_rows --max_rows ${max_rows} >>${destination} 2>&1",
+    command     => "nova-manage db archive_deleted_rows --max_rows ${max_rows} ${until_complete_real} >>${destination} 2>&1",
     environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
     user        => $user,
     minute      => $minute,
diff --git a/releasenotes/notes/add-until-complete-archive-cron-f4e3ed2dfee64c5c.yaml b/releasenotes/notes/add-until-complete-archive-cron-f4e3ed2dfee64c5c.yaml
new file mode 100644
index 000000000..991fdad38
--- /dev/null
+++ b/releasenotes/notes/add-until-complete-archive-cron-f4e3ed2dfee64c5c.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - Adds --until_complete to the archive command
+    based on an empty_table boolean flag.
+    If true, it will run in batches of max_rows
+    until the table is empty.
diff --git a/spec/acceptance/nova_wsgi_apache_spec.rb b/spec/acceptance/nova_wsgi_apache_spec.rb
index 76d18df92..355cbde24 100644
--- a/spec/acceptance/nova_wsgi_apache_spec.rb
+++ b/spec/acceptance/nova_wsgi_apache_spec.rb
@@ -111,7 +111,7 @@ describe 'basic nova' do
     end
 
     describe cron do
-      it { is_expected.to have_entry('1 0 * * * nova-manage db archive_deleted_rows --max_rows 100 >>/var/log/nova/nova-rowsflush.log 2>&1').with_user('nova') }
+      it { is_expected.to have_entry('1 0 * * * nova-manage db archive_deleted_rows --max_rows 100  >>/var/log/nova/nova-rowsflush.log 2>&1').with_user('nova') }
     end
 
     describe 'nova aggregate' do
diff --git a/spec/classes/nova_cron_archive_deleted_rows_spec.rb b/spec/classes/nova_cron_archive_deleted_rows_spec.rb
index d0de576b6..0bc1217ea 100644
--- a/spec/classes/nova_cron_archive_deleted_rows_spec.rb
+++ b/spec/classes/nova_cron_archive_deleted_rows_spec.rb
@@ -7,28 +7,52 @@ describe 'nova::cron::archive_deleted_rows' do
   end
 
   let :params do
-    { :minute      => 1,
-      :hour        => 0,
-      :monthday    => '*',
-      :month       => '*',
-      :weekday     => '*',
-      :max_rows    => '100',
-      :user        => 'nova',
-      :destination => '/var/log/nova/nova-rowsflush.log' }
+    { :minute         => 1,
+      :hour           => 0,
+      :monthday       => '*',
+      :month          => '*',
+      :weekday        => '*',
+      :max_rows       => '100',
+      :user           => 'nova',
+      :until_complete => false,
+      :destination    => '/var/log/nova/nova-rowsflush.log' }
   end
 
-  it 'configures a cron' do
-    is_expected.to contain_cron('nova-manage db archive_deleted_rows').with(
-      :command     => "nova-manage db archive_deleted_rows --max_rows #{params[:max_rows]} >>#{params[:destination]} 2>&1",
-      :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
-      :user        => params[:user],
-      :minute      => params[:minute],
-      :hour        => params[:hour],
-      :monthday    => params[:monthday],
-      :month       => params[:month],
-      :weekday     => params[:weekday],
-      :require     => 'Anchor[nova::dbsync::end]',
-    )
+  context 'until_complete is false' do
+    it 'configures a cron without until_complete' do
+      is_expected.to contain_cron('nova-manage db archive_deleted_rows').with(
+        :command     => "nova-manage db archive_deleted_rows --max_rows #{params[:max_rows]}  >>#{params[:destination]} 2>&1",
+        :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
+        :user        => params[:user],
+        :minute      => params[:minute],
+        :hour        => params[:hour],
+        :monthday    => params[:monthday],
+        :month       => params[:month],
+        :weekday     => params[:weekday],
+        :require     => 'Anchor[nova::dbsync::end]',
+      )
+    end
   end
 
+  context 'until_complete is true' do
+    before :each do
+      params.merge!(
+        :until_complete => true,
+      )
+    end
+
+    it 'configures a cron with until_complete' do
+      is_expected.to contain_cron('nova-manage db archive_deleted_rows').with(
+        :command     => "nova-manage db archive_deleted_rows --max_rows #{params[:max_rows]} --until_complete >>#{params[:destination]} 2>&1",
+        :environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
+        :user        => params[:user],
+        :minute      => params[:minute],
+        :hour        => params[:hour],
+        :monthday    => params[:monthday],
+        :month       => params[:month],
+        :weekday     => params[:weekday],
+        :require     => 'Anchor[nova::dbsync::end]',
+      )
+    end
+  end
 end