From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 20 Dec 2016 15:53:08 +0000 (-0500)
Subject: qa/tasks/qemu: copy ceph configuration to VM image
X-Git-Tag: v12.0.0~32^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42e967f0bbf7cfb5c440fcc2a1c925a4eb2318cb;p=ceph.git

qa/tasks/qemu: copy ceph configuration to VM image

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py
index 218f0a1c1534a..b9fd4e7cc291c 100644
--- a/qa/tasks/qemu.py
+++ b/qa/tasks/qemu.py
@@ -148,6 +148,13 @@ def generate_iso(ctx, config):
   mount -t xfs /dev/vd{dev_letter} /mnt/test_{dev_letter}
 """.format(dev_letter=dev_letter)
 
+        user_data += """
+- |
+  #!/bin/bash
+  test -d /etc/ceph || mkdir /etc/ceph
+  cp /mnt/cdrom/ceph.* /etc/ceph/
+"""
+
         cloud_config_archive = client_config.get('cloud_config_archive', [])
         if cloud_config_archive:
           user_data += yaml.safe_dump(cloud_config_archive, default_style='|',
@@ -186,6 +193,8 @@ def generate_iso(ctx, config):
                 '-graft-points',
                 'user-data={userdata}'.format(userdata=userdata_path),
                 'meta-data={metadata}'.format(metadata=metadata_path),
+                'ceph.conf=/etc/ceph/ceph.conf',
+                'ceph.keyring=/etc/ceph/ceph.keyring',
                 'test.sh={file}'.format(file=test_file),
                 ],
             )