From 34ef72b244b46f5a5999e3d9f179244a19ecee30 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 7 Mar 2019 18:11:03 +0000
Subject: [PATCH] Support setting metadata when creating guests

---
 zaza/charm_tests/masakari/tests.py | 1 +
 zaza/configure/guest.py            | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/zaza/charm_tests/masakari/tests.py b/zaza/charm_tests/masakari/tests.py
index 39dd655..957dbba 100644
--- a/zaza/charm_tests/masakari/tests.py
+++ b/zaza/charm_tests/masakari/tests.py
@@ -69,6 +69,7 @@ class MasakariTest(test_utils.OpenStackBaseTest):
             guest = zaza.configure.guest.launch_instance(
                 'bionic',
                 use_boot_volume=True,
+                meta={'HA_Enabled': 'True'},
                 vm_name=vm_name)
         return guest
 
diff --git a/zaza/configure/guest.py b/zaza/configure/guest.py
index d878191..02b5a52 100644
--- a/zaza/configure/guest.py
+++ b/zaza/configure/guest.py
@@ -38,7 +38,7 @@ boot_tests = {
 
 def launch_instance(instance_key, use_boot_volume=False, vm_name=None,
                     private_network_name=None, image_name=None,
-                    flavor_name=None, external_network_name=None):
+                    flavor_name=None, external_network_name=None, meta=None):
     """Launch an instance.
 
     :param instance_key: Key to collect associated config data with.
@@ -56,6 +56,9 @@ def launch_instance(instance_key, use_boot_volume=False, vm_name=None,
     :param external_network_name: External network to create floating ip from
                                   for guest.
     :type external_network_name: str
+    :param meta: A dict of arbitrary key/value metadata to store for this
+                 server. Both keys and values must be <=255 characters.
+    :type meta: dict
     """
     keystone_session = openstack_utils.get_overcloud_keystone_session()
     nova_client = openstack_utils.get_nova_session_client(keystone_session)
@@ -75,6 +78,7 @@ def launch_instance(instance_key, use_boot_volume=False, vm_name=None,
     net = neutron_client.find_resource("network", private_network_name)
     nics = [{'net-id': net.get('id')}]
 
+    meta = meta or {}
     external_network_name = external_network_name or "ext_net"
 
     if use_boot_volume:
@@ -97,6 +101,7 @@ def launch_instance(instance_key, use_boot_volume=False, vm_name=None,
         block_device_mapping_v2=bdmv2,
         flavor=flavor,
         key_name=nova_utils.KEYPAIR_NAME,
+        meta=meta,
         nics=nics)
 
     # Test Instance is ready.