aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-11 21:25:18 +0000
committerGerrit Code Review <review@openstack.org>2015-12-11 21:25:18 +0000
commit335c739a0a61ec31555b463fd62731edb29e41de (patch)
tree692de556db9c5d4970f08543a1770adb432c8720
parent431e0f9ff24ff27ead9c4050ccd0ff22c8137ec3 (diff)
parenta02bcdcacc593d709f7a25b729d931f6f8708dc1 (diff)
downloadkolla-335c739a0a61ec31555b463fd62731edb29e41de.tar.gz
kolla-335c739a0a61ec31555b463fd62731edb29e41de.zip
Merge "Change nova-compute upgrade level to auto"
-rw-r--r--ansible/roles/nova/templates/nova.conf.j23
1 files changed, 3 insertions, 0 deletions
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index eae040fdf..a80962d75 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -142,3 +142,6 @@ disk_cachemodes="network=writeback"
live_migration_flag="VIR_MIGRATE_UNDEFINE_SOURCE,VIR_MIGRATE_PEER2PEER,VIR_MIGRATE_LIVE,VIR_MIGRATE_PERSIST_DEST,VIR_MIGRATE_TUNNELLED"
hw_disk_discard = unmap
{% endif %}
+
+[upgrade_levels]
+compute = auto