From: Zack Cerza <zack@redhat.com>
Date: Tue, 22 Dec 2015 23:22:24 +0000 (-0700)
Subject: Downburst: Make MAC setting persistent
X-Git-Tag: 1.1.0~709^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c33b30c769b9c065972857acd2b5e4b689ba1464;p=teuthology.git

Downburst: Make MAC setting persistent

On CentOS hosts, the MAC is being reset on some reboots. Write it to the
appropriate file.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/provision.py b/teuthology/provision.py
index 8c028b48b..fe5114117 100644
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -155,13 +155,16 @@ class Downburst(object):
         """
         config_fd = tempfile.NamedTemporaryFile(delete=False)
 
+        os_type = self.os_type.lower()
+        mac_address = self.status['mac_address']
+
         file_info = {
             'disk-size': '100G',
             'ram': '1.9G',
             'cpus': 1,
             'networks': [
-                {'source': 'front', 'mac': self.status['mac_address']}],
-            'distro': self.os_type.lower(),
+                {'source': 'front', 'mac': mac_address}],
+            'distro': os_type,
             'distroversion': self.os_version,
             'additional-disks': 3,
             'additional-disks-size': '200G',
@@ -178,6 +181,12 @@ class Downburst(object):
         user_info = {
             'user': self.user,
         }
+        # On CentOS/RHEL/Fedora, write the correct mac address
+        if os_type in ['centos', 'rhel', 'fedora']:
+            user_info['runcmd'] = [
+                ['sed', '-ie', 's/HWADDR=".*"/HWADDR="%s"/' % mac_address,
+                 '/etc/sysconfig/network-scripts/ifcfg-eth0'],
+            ]
         user_fd = tempfile.NamedTemporaryFile(delete=False)
         yaml.safe_dump(user_info, user_fd)
         self.user_path = user_fd.name