master only support newton

JIRA: COMPASS-513

Remove other roles and ppa, master only support newton.

Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>

1 files changed, 1 insertions, 31 deletions

diff --git a/repo/repo_func.sh b/repo/repo_func.sh
index e5d2a244..d3ce201d 100755
--- a/repo/repo_func.sh
+++ b/repo/repo_func.sh
@@ -379,42 +379,12 @@ EOF
 
 }
 
-# FIXME: rhel7 -> centos7, redhat7 -> rhel7
 # Make all the openstack ppas
 function make_osppa()
 {
-
-    for opv in juno kilo liberty mitaka; do
-    make_repo --os-ver trusty --package-tag $opv \
-              --ansible-dir $COMPASS_PATH/deploy/adapters/ansible \
-              --default-package "openssh-server" \
-              --special-package "openvswitch-switch"
-    done
-
-    for opv in mitaka newton; do
-    make_repo --os-ver xenial --package-tag $opv \
+    make_repo --os-ver xenial --package-tag newton \
               --ansible-dir $COMPASS_PATH/deploy/adapters/ansible \
               --default-package "openssh-server"
-    done
-
-    make_repo --os-ver rhel7 --package-tag juno \
-              --ansible-dir $COMPASS_PATH/deploy/adapters/ansible \
-              --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \
-                                 dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3"
-
-    for opv in kilo liberty mitaka; do
-    make_repo --os-ver rhel7 --package-tag $opv \
-              --ansible-dir $COMPASS_PATH/deploy/adapters/ansible \
-              --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \
-                                 dracut-config-rescue-033-241.el7_1.5 dracut-network-033-241.el7_1.5"
-    done
-
-#    for opv in osp9; do
-#    make_repo --os-ver redhat7 --package-tag $opv \
-#              --ansible-dir $COMPASS_PATH/deploy/adapters/ansible \
-#              --default-package "strace net-tools wget vim openssh-server"
-#    done
-
 }
 
 function make_compass_repo()