Merge "Adding an ability to specify batches num for online migrations." into release/2019.2.0
diff --git a/nova/upgrade/pre/init.sls b/nova/upgrade/pre/init.sls
index 0c5834e..4ca128d 100644
--- a/nova/upgrade/pre/init.sls
+++ b/nova/upgrade/pre/init.sls
@@ -24,6 +24,7 @@
include:
- nova.db.online_sync
+{%- if controller.version not in ["juno", "kilo", "liberty", "mitaka", "newton"] %}
nova_status:
cmd.run:
- name: nova-status upgrade check
@@ -31,6 +32,7 @@
- onlyif: /bin/false
{%- endif %}
{%- endif %}
+{%- endif %}
{%- set os_content = salt['mine.get']('I@keystone:client:os_client_config:enabled:true', 'keystone_os_client_config', 'compound').values()[0] %}
keystone_os_client_config: