Correct use of reserved_host_memory{_mb}

The charm templates use the invalid configuration option:

 reserved_host_memory

to configure the reserved memory for a compute host; update
this to:

 reserved_host_memory_mb

to ensure that memory gets correctly reserved for the host.

Change-Id: I7b8089b165fddc023305ee37efe95e571e8d2407
Closes-Bug: #1646657

templates/kilo/nova.conf

@@ -116,7 +116,7 @@ instances_path = {{ instances_path }}
 {% if vcpu_pin_set -%}
 vcpu_pin_set = {{ vcpu_pin_set }}
 {% endif -%}
-reserved_host_memory = {{ reserved_host_memory }}
+reserved_host_memory_mb = {{ reserved_host_memory }}
 
 {% if pci_passthrough_whitelist -%}
 pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}

templates/liberty/nova.conf

@@ -122,7 +122,7 @@ notify_on_state_change = {{ notify_on_state_change }}
 {% if vcpu_pin_set -%}
 vcpu_pin_set = {{ vcpu_pin_set }}
 {% endif -%}
-reserved_host_memory = {{ reserved_host_memory }}
+reserved_host_memory_mb = {{ reserved_host_memory }}
 
 {% if pci_passthrough_whitelist -%}
 pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}

templates/mitaka/nova.conf

@@ -123,7 +123,7 @@ notify_on_state_change = {{ notify_on_state_change }}
 {% if vcpu_pin_set -%}
 vcpu_pin_set = {{ vcpu_pin_set }}
 {% endif -%}
-reserved_host_memory = {{ reserved_host_memory }}
+reserved_host_memory_mb = {{ reserved_host_memory }}
 
 {% if pci_passthrough_whitelist -%}
 pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}

tests/gate-basic-trusty-icehouse

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #

tests/gate-basic-trusty-kilo

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #

tests/gate-basic-trusty-liberty

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #

tests/gate-basic-trusty-mitaka

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #

tests/gate-basic-xenial-mitaka

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #

tests/gate-basic-xenial-newton

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #

tests/gate-basic-yakkety-newton

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2016 Canonical Ltd
 #