From: Loic Dachary <ldachary@redhat.com>
Date: Mon, 7 Sep 2015 21:31:39 +0000 (+0200)
Subject: openstack: get rid of failed attempt to use ephemerals
X-Git-Tag: 1.1.0~814^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ed83d8833be514cb94454da2481974fcc012de3;p=teuthology.git

openstack: get rid of failed attempt to use ephemerals

It's a hack at best.

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

diff --git a/teuthology/openstack/openstack-centos-6.5-user-data.txt b/teuthology/openstack/openstack-centos-6.5-user-data.txt
index 76a637b11..0d4e457af 100644
--- a/teuthology/openstack/openstack-centos-6.5-user-data.txt
+++ b/teuthology/openstack/openstack-centos-6.5-user-data.txt
@@ -21,7 +21,4 @@ packages:
 runcmd:
  - mkinitrd --force /boot/initramfs-2.6.32-504.1.3.el6.x86_64.img 2.6.32-504.1.3.el6.x86_64
  - reboot
-#runcmd:
-# # if /mnt is on ephemeral, that moves /home/{username} on the ephemeral, otherwise it does nothing
-# - rsync -a --numeric-ids /home/{username}/ /mnt/ && rm -fr /home/{username} && ln -s /mnt /home/{username}
 final_message: "{up}, after $UPTIME seconds"
diff --git a/teuthology/openstack/openstack-centos-7.0-user-data.txt b/teuthology/openstack/openstack-centos-7.0-user-data.txt
index abba277cf..c3286f147 100644
--- a/teuthology/openstack/openstack-centos-7.0-user-data.txt
+++ b/teuthology/openstack/openstack-centos-7.0-user-data.txt
@@ -18,8 +18,4 @@ packages:
  - 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
-# - rsync -a --numeric-ids /home/{username}/ /mnt/ && rm -fr /home/{username} && ln -s /mnt /home/{username}
 final_message: "{up}, after $UPTIME seconds"
diff --git a/teuthology/openstack/openstack-ubuntu-user-data.txt b/teuthology/openstack/openstack-ubuntu-user-data.txt
index b7c94fb22..e05f1ade9 100644
--- a/teuthology/openstack/openstack-ubuntu-user-data.txt
+++ b/teuthology/openstack/openstack-ubuntu-user-data.txt
@@ -16,7 +16,4 @@ packages:
  - wget
  - git
  - ntp
-runcmd:
- # if /mnt is on ephemeral, that moves /home/{username} on the ephemeral, otherwise it does nothing
- - rsync -a --numeric-ids /home/{username}/ /mnt/ && rm -fr /home/{username} && ln -s /mnt /home/{username}
 final_message: "{up}, after $UPTIME seconds"