Merge lp:~ltrager/maas-images/import_all_centos_images into lp:maas-images

[Lee Trager]

Download CentOS images with a short version string

Upstream is producing new CentOS images with a short version string. Previously the format YYYYMMDD_XX was used, now they are using YYMM. This modifies CentOS import to capture all images and converts the short version string into a long version string so MAAS uses the latest image, not the one with the longest version string.

[lp:~ltrager/maas-images/import_all_centos_images]

292. By Lee Trager on 2016-04-18

Merge centos-python23

293. By Lee Trager on 2016-04-18

Add better comment

Unmerged revisions

=== added symlink 'curtin/centos6/curtin-hooks'
=== target is u'python_wrapper'
=== renamed file 'curtin/centos6/curtin-hooks' => 'curtin/centos6/curtin-hooks.real'
--- curtin/centos6/curtin-hooks	2015-08-31 20:46:57 +0000
+++ curtin/centos6/curtin-hooks.real	2016-04-15 20:44:25 +0000
@@ -6,6 +6,7 @@
     unicode_literals,
     )
 
+import codecs
 import os
 import re
 import sys
@@ -83,8 +84,8 @@
 
 def read_file(path):
     """Returns content of a file."""
-    with open(path, 'rb') as stream:
-        return stream.read().encode('utf-8')
+    with codecs.open(path, encoding='utf-8') as stream:
+        return stream.read()
 
 
 def write_fstab(target, curtin_fstab):
@@ -183,7 +184,7 @@
         data = '\n'.join([
             'find /boot/grub/stage1',
             'quit',
-            ])
+            ]).encode('utf-8')
         out, err = in_chroot(['grub', '--batch'],
             data=data, capture=True)
         regex = re.search('^\s+(\(.+?\))$', out, re.MULTILINE)
@@ -198,7 +199,7 @@
             'root %s' % root,
             'setup %s' % root_dev,
             'quit',
-            ])
+            ]).encode('utf-8')
         in_chroot(['grub', '--batch'],
             data=data)
 
 
=== added symlink 'curtin/centos6/finalize'
=== target is u'python_wrapper'
=== renamed file 'curtin/centos6/finalize' => 'curtin/centos6/finalize.real'
=== added file 'curtin/centos6/python_wrapper'
--- curtin/centos6/python_wrapper	1970-01-01 00:00:00 +0000
+++ curtin/centos6/python_wrapper	2016-04-15 20:44:25 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Ubuntu 16.04 only ships with Python 3 while previous versions only ship
+# with Python 2.
+if type -p python > /dev/null; then
+    exec python "$0.real" "$@"
+else
+    exec python3 "$0.real" "$@"
+fi
 
=== added symlink 'curtin/centos7/curtin-hooks'
=== target is u'python_wrapper'
=== renamed file 'curtin/centos7/curtin-hooks' => 'curtin/centos7/curtin-hooks.real'
--- curtin/centos7/curtin-hooks	2015-08-31 20:46:57 +0000
+++ curtin/centos7/curtin-hooks.real	2016-04-15 20:44:25 +0000
@@ -6,6 +6,7 @@
     unicode_literals,
     )
 
+import codecs
 import os
 import re
 import sys
@@ -83,8 +84,8 @@
 
 def read_file(path):
     """Returns content of a file."""
-    with open(path, 'rb') as stream:
-        return stream.read().encode('utf-8')
+    with codecs.open(path, encoding='utf-8') as stream:
+        return stream.read()
 
 
 def write_fstab(target, curtin_fstab):
 
=== added symlink 'curtin/centos7/finalize'
=== target is u'python_wrapper'
=== renamed file 'curtin/centos7/finalize' => 'curtin/centos7/finalize.real'
=== added file 'curtin/centos7/python_wrapper'
--- curtin/centos7/python_wrapper	1970-01-01 00:00:00 +0000
+++ curtin/centos7/python_wrapper	2016-04-15 20:44:25 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Ubuntu 16.04 only ships with Python 3 while previous versions only ship
+# with Python 2.
+if type -p python > /dev/null; then
+    exec python "$0.real" "$@"
+else
+    exec python3 "$0.real" "$@"
+fi
 
=== modified file 'meph2/commands/meph2_util.py'
--- meph2/commands/meph2_util.py	2016-01-25 18:35:31 +0000
+++ meph2/commands/meph2_util.py	2016-04-15 20:44:25 +0000
@@ -332,7 +332,9 @@
     """
     ret = dict()
     content = geturl_text(url)
-    prog = re.compile('[0-9]{8}(_[0-9]+)')
+    # CentOS has two version strings a long version uses the format YYYYMMDD_XX
+    # while a short version uses YYMM. Detect both
+    prog = re.compile('([\d]{8}(_[\d]+))|(\d{4})')
 
     for i in content.split('\n'):
         try:
@@ -347,6 +349,11 @@
             continue
         img_version = m.group(0)
 
+        # Turn the short version string into a long version string so that MAAS
+        # uses the latest version, not the longest
+        if len(img_version) == 4:
+            img_version = "20%s01_01" % img_version
+
         # Prefer compressed image over uncompressed
         if (img_version in ret and
                 ret[img_version]['img_name'].endswith('qcow2.xz')):