From a37c470e1fe1a51c4e0935ffe10ac1bd7f8810b7 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Thu, 28 Feb 2019 17:04:47 +0000
Subject: [PATCH] Add config missing in rocky template

These nova.conf config were added while rocky was being added and
so didnt make it into the rocky nova.conf (since the template didnt
exist when the patches were started).

Change-Id: Ie4d3ba515cb0a6f9f7fa198a9ac1c05c4c2c233a
Related-Bug: #1804169
Related-Bug: #1799916
---
 templates/rocky/nova.conf | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/templates/rocky/nova.conf b/templates/rocky/nova.conf
index b250d236..7fd66eb5 100644
--- a/templates/rocky/nova.conf
+++ b/templates/rocky/nova.conf
@@ -124,6 +124,12 @@ vcpu_pin_set = {{ vcpu_pin_set }}
 {% endif -%}
 reserved_host_memory_mb = {{ reserved_host_memory }}
 
+{% if reserved_huge_pages -%}
+{% for value in reserved_huge_pages -%}
+reserved_huge_pages = {{ value }}
+{% endfor -%}
+{% endif -%}
+
 {% include "section-zeromq" %}
 
 {% if default_availability_zone -%}
@@ -215,6 +221,12 @@ rbd_secret_uuid = {{ rbd_secret_uuid }}
 {% if live_migration_uri -%}
 live_migration_uri = {{ live_migration_uri }}
 {% endif -%}
+{% if live_migration_permit_post_copy -%}
+live_migration_permit_post_copy = {{ live_migration_permit_post_copy }}
+{% endif -%}
+{% if live_migration_permit_auto_converge -%}
+live_migration_permit_auto_converge = {{ live_migration_permit_auto_converge }}
+{% endif -%}
 {% if disk_cachemodes -%}
 disk_cachemodes = {{ disk_cachemodes }}
 {% endif %}