Browse code

Merge "debian: do not enable grizzly repository from gplhost" into stable/icehouse

Jenkins authored on 2014/10/03 03:29:01
Showing 1 changed files
... ...
@@ -219,15 +219,6 @@ fi
219 219
 # Some distros need to add repos beyond the defaults provided by the vendor
220 220
 # to pick up required packages.
221 221
 
222
-# The Debian Wheezy official repositories do not contain all required packages,
223
-# add gplhost repository.
224
-if [[ "$os_VENDOR" =~ (Debian) ]]; then
225
-    echo 'deb http://archive.gplhost.com/debian grizzly main' | sudo tee /etc/apt/sources.list.d/gplhost_wheezy-backports.list
226
-    echo 'deb http://archive.gplhost.com/debian grizzly-backports main' | sudo tee -a /etc/apt/sources.list.d/gplhost_wheezy-backports.list
227
-    apt_get update
228
-    apt_get install --force-yes gplhost-archive-keyring
229
-fi
230
-
231 222
 if [[ is_fedora && $DISTRO =~ (rhel) ]]; then
232 223
     # Installing Open vSwitch on RHEL requires enabling the RDO repo.
233 224
     RHEL6_RDO_REPO_RPM=${RHEL6_RDO_REPO_RPM:-"http://rdo.fedorapeople.org/openstack-icehouse/rdo-release-icehouse.rpm"}