Fixed distro symblinks

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

diff --git a/suites/teuthology/buildpackages/distros b/suites/teuthology/buildpackages/distros
index c5d59352cb5eaf1e9403efad18de673a1bf55583..dd0d7f1d5bdcae56ca40fe053830ec800679e307 120000 (symlink)
--- 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 (symlink)
index 0000000..dd0d7f1
--- /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 (file)
index 7f9778d..0000000
--- 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 (file)
index 150451b..0000000
--- 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 (file)
index 59b9779..0000000
--- 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 (file)
index c87c0bc..0000000
--- 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 (file)
index dbc3a8d..0000000
--- 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 (file)
index 309e989..0000000
--- 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 (file)
index 5d7ba67..0000000
--- 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 (file)
index 9ff9e84..0000000
--- 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 (file)
index e9afa87..0000000
--- 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 (file)
index ac95e21..0000000
--- 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 (file)
index 7a3df79..0000000
--- 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 (file)
index f895a55..0000000
--- 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 (file)
index f5bb7b8..0000000
--- 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 (file)
index d19bff2..0000000
--- 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 (file)
index 3c3b250..0000000
--- 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 (symlink)
index 0000000..dd0d7f1
--- /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 (file)
index c87c0bc..0000000
--- 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 (file)
index dbc3a8d..0000000
--- 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 (file)
index 309e989..0000000
--- 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 (file)
index 9ff9e84..0000000
--- 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 (file)
index 7a3df79..0000000
--- 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 (file)
index f5bb7b8..0000000
--- 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"