Merge "Ensure we set compute upgrade_level"

2020-01-07 11:36:47 +00:00
parent 0065d148f6 bfea6cc43f
commit 49d6e5b5d2
5 changed files with 15 additions and 0 deletions
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -166,6 +166,9 @@ vendordata_jsonfile_path = /etc/nova/vendor_data.json
 {% endfor -%}
 {% endif %}

+[upgrade_levels]
+compute = auto
+
 {% include "section-zeromq" %}

 {% include "parts/database-v2" %}
--- a/templates/newton/nova.conf
+++ b/templates/newton/nova.conf
@@ -163,6 +163,9 @@ volume_api_class=nova.volume.cinder.API
 {% endfor -%}
 {% endif %}

+[upgrade_levels]
+compute = auto
+
 {% include "section-zeromq" %}

 {% include "parts/database-v2" %}
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -123,6 +123,9 @@ volume_api_class=nova.volume.cinder.API
 {% endfor -%}
 {% endif %}

+[upgrade_levels]
+compute = auto
+
 {% include "section-zeromq" %}

 {% include "parts/database-v2" %}
--- a/templates/pike/nova.conf
+++ b/templates/pike/nova.conf
@@ -124,6 +124,9 @@ volume_api_class=nova.volume.cinder.API
 {% endfor -%}
 {% endif %}

+[upgrade_levels]
+compute = auto
+
 {% include "section-zeromq" %}

 {% include "parts/database-v2" %}
--- a/templates/rocky/nova.conf
+++ b/templates/rocky/nova.conf
@@ -130,6 +130,9 @@ volume_api_class=nova.volume.cinder.API
 {% endfor -%}
 {% endif %}

+[upgrade_levels]
+compute = auto
+
 {% include "section-zeromq" %}

 {% include "parts/database-v2" %}