openstack: centos-7 image must be recent

Using the CentOS 7 image available at

  http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2

ansible will think it runs

  RedHat 7.1.1503 (Core)

and with a more recent image

  http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1503.qcow2

it will think that it runs

  CentOS Linux release 7.1.1503 (Core)

http://tracker.ceph.com/issues/12725 Fixes: #12725

Signed-off-by: Loic Dachary <loic@dachary.org>
tmp

diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 01082e84327cb3809b65f3b4a63b8ceb084f03a2..125633e68a98bef046001245b1d0ad27db4cd2e2 100644 (file)
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -54,7 +54,7 @@ class OpenStack(object):
     # wget -O fedora-20.qcow2 http://fedora.mirrors.ovh.net/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2
     image2url = {
         'centos-6.5': 'http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud.qcow2',
-        'centos-7.0': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2',
+        'centos-7.0': 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-20150628_01.qcow2',
         'ubuntu-14.04': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img',
     }
 

diff --git a/teuthology/openstack/openstack-centos-7.0-user-data.txt b/teuthology/openstack/openstack-centos-7.0-user-data.txt
index 79857703a8b01723c47f12ba5971c9b05c238847..abba277cf1728c78f199f5d7bda2ee9a54e3ebeb 100644 (file)
--- a/teuthology/openstack/openstack-centos-7.0-user-data.txt
+++ b/teuthology/openstack/openstack-centos-7.0-user-data.txt
@@ -17,6 +17,7 @@ packages:
  - wget
  - git
  - ntp
+ - redhat-lsb-core
 # this does not work on centos, ssh key will not be working, maybe because there is a symlink to reach it ?
 #runcmd:
 # # if /mnt is on ephemeral, that moves /home/{username} on the ephemeral, otherwise it does nothing