openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "Fix hard-coding of trusty in devstack plugin.sh"

This commit is contained in:
Jenkins 2016-06-11 02:23:12 +00:00 committed by Gerrit Code Review
parent 940fb4e6db 0f8faacd5e
commit ac9ecb72fa
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -8,13 +8,14 @@ function neutron_lbaas_install {
function neutron_agent_lbaas_install_agent_packages {
if is_ubuntu; then
if [[ ${OFFLINE} == False ]]; then
BACKPORT="deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse"
UBUNTU_CODENAME=$(lsb_release -cs)
BACKPORT="deb http://archive.ubuntu.com/ubuntu ${UBUNTU_CODENAME}-backports main restricted universe multiverse"
BACKPORT_EXISTS=$(grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep "${BACKPORT}") || true
if [[ -z "${BACKPORT_EXISTS}" ]]; then
sudo add-apt-repository "${BACKPORT}" -y
fi
sudo apt-get update
sudo apt-get install haproxy -t trusty-backports
sudo apt-get install haproxy -t ${UBUNTU_CODENAME}-backports
fi
fi
if is_fedora || is_suse; then