diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml
index b95da8aff2..c30f97c989 100644
--- a/ansible/roles/cinder/defaults/main.yml
+++ b/ansible/roles/cinder/defaults/main.yml
@@ -56,10 +56,6 @@ cinder_database_name: "cinder"
 cinder_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}cinder{% endif %}"
 cinder_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}"
 
-# Max number of object to consider
-# when run online data migration
-# cinder_max_number_osm: ""
-
 ####################
 # Docker
 ####################
diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml
index 7f267399c3..e29184b20e 100644
--- a/ansible/roles/cinder/tasks/upgrade.yml
+++ b/ansible/roles/cinder/tasks/upgrade.yml
@@ -22,7 +22,6 @@
     environment:
       KOLLA_OSM:
       KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-      MAX_NUMBER: "{{ cinder_max_number_osm | default(10) }}"
     image: "{{ cinder_api.image }}"
     labels:
       BOOTSTRAP:
diff --git a/releasenotes/notes/fix-cinder-upgrade-max-count-ab928f85f224c63d.yaml b/releasenotes/notes/fix-cinder-upgrade-max-count-ab928f85f224c63d.yaml
new file mode 100644
index 0000000000..525f7e4a79
--- /dev/null
+++ b/releasenotes/notes/fix-cinder-upgrade-max-count-ab928f85f224c63d.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes an issue with Cinder upgrades that would cause online schema
+    migration to fail. `LP#1880753 <https://launchpad.net/bugs/1880753>`__