From 9d7801dba456e7dd19e4ce27c46951e70ed82e76 Mon Sep 17 00:00:00 2001
From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 8 Apr 2016 17:01:29 -0700
Subject: [PATCH] Fixed distro symblinks

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---
 suites/teuthology/buildpackages/distros                | 2 +-
 suites/teuthology/ceph/distros                         | 1 +
 suites/teuthology/ceph/distros/rhel.yaml               | 1 -
 suites/teuthology/ceph/distros/ubuntu.yaml             | 1 -
 suites/teuthology/no-ceph/distros/baremetal.yaml       | 1 -
 suites/teuthology/no-ceph/distros/rhel7.0.yaml         | 2 --
 suites/teuthology/no-ceph/distros/ubuntu12.04.yaml     | 2 --
 suites/teuthology/no-ceph/distros/ubuntu14.04.yaml     | 2 --
 suites/teuthology/no-ceph/distros/vps.yaml             | 1 -
 suites/teuthology/no-ceph/distros/vps_centos6.5.yaml   | 3 ---
 suites/teuthology/no-ceph/distros/vps_centos7.1.yaml   | 3 ---
 suites/teuthology/no-ceph/distros/vps_centos7.2.yaml   | 3 ---
 suites/teuthology/no-ceph/distros/vps_debian7.yaml     | 3 ---
 suites/teuthology/no-ceph/distros/vps_rhel6.4.yaml     | 3 ---
 suites/teuthology/no-ceph/distros/vps_rhel6.5.yaml     | 3 ---
 suites/teuthology/no-ceph/distros/vps_rhel7.0.yaml     | 3 ---
 suites/teuthology/no-ceph/distros/vps_ubuntu14.04.yaml | 3 ---
 suites/teuthology/rgw/distros                          | 1 +
 suites/teuthology/rgw/distros/rhel7.0.yaml             | 2 --
 suites/teuthology/rgw/distros/ubuntu12.04.yaml         | 2 --
 suites/teuthology/rgw/distros/ubuntu14.04.yaml         | 2 --
 suites/teuthology/rgw/distros/vps_centos6.5.yaml       | 3 ---
 suites/teuthology/rgw/distros/vps_debian7.yaml         | 3 ---
 suites/teuthology/rgw/distros/vps_rhel6.5.yaml         | 3 ---
 24 files changed, 3 insertions(+), 50 deletions(-)
 create mode 120000 suites/teuthology/ceph/distros
 delete mode 100644 suites/teuthology/ceph/distros/rhel.yaml
 delete mode 100644 suites/teuthology/ceph/distros/ubuntu.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/baremetal.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/rhel7.0.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/ubuntu12.04.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/ubuntu14.04.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_centos6.5.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_centos7.1.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_centos7.2.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_debian7.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_rhel6.4.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_rhel6.5.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_rhel7.0.yaml
 delete mode 100644 suites/teuthology/no-ceph/distros/vps_ubuntu14.04.yaml
 create mode 120000 suites/teuthology/rgw/distros
 delete mode 100644 suites/teuthology/rgw/distros/rhel7.0.yaml
 delete mode 100644 suites/teuthology/rgw/distros/ubuntu12.04.yaml
 delete mode 100644 suites/teuthology/rgw/distros/ubuntu14.04.yaml
 delete mode 100644 suites/teuthology/rgw/distros/vps_centos6.5.yaml
 delete mode 100644 suites/teuthology/rgw/distros/vps_debian7.yaml
 delete mode 100644 suites/teuthology/rgw/distros/vps_rhel6.5.yaml

diff --git a/suites/teuthology/buildpackages/distros b/suites/teuthology/buildpackages/distros
index c5d59352cb5e..dd0d7f1d5bdc 120000
--- a/suites/teuthology/buildpackages/distros
+++ b/suites/teuthology/buildpackages/distros
@@ -1 +1 @@
-../../../distros/supported
\ No newline at end of file
+../../../distros/supported/
\ No newline at end of file
diff --git a/suites/teuthology/ceph/distros b/suites/teuthology/ceph/distros
new file mode 120000
index 000000000000..dd0d7f1d5bdc
--- /dev/null
+++ b/suites/teuthology/ceph/distros
@@ -0,0 +1 @@
+../../../distros/supported/
\ No newline at end of file
diff --git a/suites/teuthology/ceph/distros/rhel.yaml b/suites/teuthology/ceph/distros/rhel.yaml
deleted file mode 100644
index 7f9778d770cd..000000000000
--- a/suites/teuthology/ceph/distros/rhel.yaml
+++ /dev/null
@@ -1 +0,0 @@
-os_type: rhel
diff --git a/suites/teuthology/ceph/distros/ubuntu.yaml b/suites/teuthology/ceph/distros/ubuntu.yaml
deleted file mode 100644
index 150451be028e..000000000000
--- a/suites/teuthology/ceph/distros/ubuntu.yaml
+++ /dev/null
@@ -1 +0,0 @@
-os_type: ubuntu
diff --git a/suites/teuthology/no-ceph/distros/baremetal.yaml b/suites/teuthology/no-ceph/distros/baremetal.yaml
deleted file mode 100644
index 59b9779b905e..000000000000
--- a/suites/teuthology/no-ceph/distros/baremetal.yaml
+++ /dev/null
@@ -1 +0,0 @@
-# left blank so we'll take the default baremetal machine_type and os_type / os_version 
diff --git a/suites/teuthology/no-ceph/distros/rhel7.0.yaml b/suites/teuthology/no-ceph/distros/rhel7.0.yaml
deleted file mode 100644
index c87c0bc135b7..000000000000
--- a/suites/teuthology/no-ceph/distros/rhel7.0.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: "7.0"
diff --git a/suites/teuthology/no-ceph/distros/ubuntu12.04.yaml b/suites/teuthology/no-ceph/distros/ubuntu12.04.yaml
deleted file mode 100644
index dbc3a8d9c587..000000000000
--- a/suites/teuthology/no-ceph/distros/ubuntu12.04.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "12.04"
diff --git a/suites/teuthology/no-ceph/distros/ubuntu14.04.yaml b/suites/teuthology/no-ceph/distros/ubuntu14.04.yaml
deleted file mode 100644
index 309e989feebd..000000000000
--- a/suites/teuthology/no-ceph/distros/ubuntu14.04.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "14.04"
diff --git a/suites/teuthology/no-ceph/distros/vps.yaml b/suites/teuthology/no-ceph/distros/vps.yaml
deleted file mode 100644
index 5d7ba673c947..000000000000
--- a/suites/teuthology/no-ceph/distros/vps.yaml
+++ /dev/null
@@ -1 +0,0 @@
-machine_type: vps
diff --git a/suites/teuthology/no-ceph/distros/vps_centos6.5.yaml b/suites/teuthology/no-ceph/distros/vps_centos6.5.yaml
deleted file mode 100644
index 9ff9e84d4348..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_centos6.5.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: centos 
-os_version: "6.5"
diff --git a/suites/teuthology/no-ceph/distros/vps_centos7.1.yaml b/suites/teuthology/no-ceph/distros/vps_centos7.1.yaml
deleted file mode 100644
index e9afa87166f4..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_centos7.1.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: centos 
-os_version: "7.1"
diff --git a/suites/teuthology/no-ceph/distros/vps_centos7.2.yaml b/suites/teuthology/no-ceph/distros/vps_centos7.2.yaml
deleted file mode 100644
index ac95e2145ce0..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_centos7.2.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: centos 
-os_version: "7.2"
diff --git a/suites/teuthology/no-ceph/distros/vps_debian7.yaml b/suites/teuthology/no-ceph/distros/vps_debian7.yaml
deleted file mode 100644
index 7a3df798862c..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_debian7.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: debian 
-os_version: "7.0"
diff --git a/suites/teuthology/no-ceph/distros/vps_rhel6.4.yaml b/suites/teuthology/no-ceph/distros/vps_rhel6.4.yaml
deleted file mode 100644
index f895a55cdbfb..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_rhel6.4.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: rhel 
-os_version: "6.4"
diff --git a/suites/teuthology/no-ceph/distros/vps_rhel6.5.yaml b/suites/teuthology/no-ceph/distros/vps_rhel6.5.yaml
deleted file mode 100644
index f5bb7b83739b..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_rhel6.5.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: rhel 
-os_version: "6.5"
diff --git a/suites/teuthology/no-ceph/distros/vps_rhel7.0.yaml b/suites/teuthology/no-ceph/distros/vps_rhel7.0.yaml
deleted file mode 100644
index d19bff22d0bf..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_rhel7.0.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: rhel
-os_version: "7.0"
diff --git a/suites/teuthology/no-ceph/distros/vps_ubuntu14.04.yaml b/suites/teuthology/no-ceph/distros/vps_ubuntu14.04.yaml
deleted file mode 100644
index 3c3b25001979..000000000000
--- a/suites/teuthology/no-ceph/distros/vps_ubuntu14.04.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: ubuntu
-os_version: "14.04"
diff --git a/suites/teuthology/rgw/distros b/suites/teuthology/rgw/distros
new file mode 120000
index 000000000000..dd0d7f1d5bdc
--- /dev/null
+++ b/suites/teuthology/rgw/distros
@@ -0,0 +1 @@
+../../../distros/supported/
\ No newline at end of file
diff --git a/suites/teuthology/rgw/distros/rhel7.0.yaml b/suites/teuthology/rgw/distros/rhel7.0.yaml
deleted file mode 100644
index c87c0bc135b7..000000000000
--- a/suites/teuthology/rgw/distros/rhel7.0.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: rhel
-os_version: "7.0"
diff --git a/suites/teuthology/rgw/distros/ubuntu12.04.yaml b/suites/teuthology/rgw/distros/ubuntu12.04.yaml
deleted file mode 100644
index dbc3a8d9c587..000000000000
--- a/suites/teuthology/rgw/distros/ubuntu12.04.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "12.04"
diff --git a/suites/teuthology/rgw/distros/ubuntu14.04.yaml b/suites/teuthology/rgw/distros/ubuntu14.04.yaml
deleted file mode 100644
index 309e989feebd..000000000000
--- a/suites/teuthology/rgw/distros/ubuntu14.04.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-os_type: ubuntu
-os_version: "14.04"
diff --git a/suites/teuthology/rgw/distros/vps_centos6.5.yaml b/suites/teuthology/rgw/distros/vps_centos6.5.yaml
deleted file mode 100644
index 9ff9e84d4348..000000000000
--- a/suites/teuthology/rgw/distros/vps_centos6.5.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: centos 
-os_version: "6.5"
diff --git a/suites/teuthology/rgw/distros/vps_debian7.yaml b/suites/teuthology/rgw/distros/vps_debian7.yaml
deleted file mode 100644
index 7a3df798862c..000000000000
--- a/suites/teuthology/rgw/distros/vps_debian7.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: debian 
-os_version: "7.0"
diff --git a/suites/teuthology/rgw/distros/vps_rhel6.5.yaml b/suites/teuthology/rgw/distros/vps_rhel6.5.yaml
deleted file mode 100644
index f5bb7b83739b..000000000000
--- a/suites/teuthology/rgw/distros/vps_rhel6.5.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-machine_type: vps
-os_type: rhel 
-os_version: "6.5"
-- 
2.47.3