commit 3021fc727b537469a6a6b2870376954262db7efc
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Mar 26 11:33:12 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Mar 26 11:33:12 2019 +0000
tree 7735d9ef3ed66006574b7a134b55c4edc8a8cf94
parent 9adb24d1cc10b0b85a63430a96680e22b5594148
parent 1d5706afafb86271a16872d2005a8d955b67977f

Merge "Using upgrade.old_release in nova.upgrade.pre state" into release/2019.2.0

nova/upgrade/pre/init.sls

diff --git a/nova/upgrade/pre/init.sls b/nova/upgrade/pre/init.sls
index 9ed049a..0c5834e 100644
--- a/nova/upgrade/pre/init.sls
+++ b/nova/upgrade/pre/init.sls
@@ -16,7 +16,7 @@
 /etc/nova/nova.conf:
   file.managed:
   - name: /etc/nova/nova.conf
-  - source: salt://nova/files/{{ _data.version }}/nova-{{ type }}.conf.{{ grains.os_family }}
+  - source: salt://nova/files/{{ upgrade.old_release }}/nova-{{ type }}.conf.{{ grains.os_family }}
   - template: jinja
 
 {%- if controller.get('enabled') %}