openstack
/
octavia
Code Issues Proposed changes

Add backport keepalived 

Added keepalived-octavia-ubuntu elements and deleteted vrrp-octavia elements.

Closes-bug: #1481050
Change-Id: I1c55d3f32663087643cf81f1a6e9e3fb7caad8ee
This commit is contained in:
minwang 2015-11-12 12:52:09 -08:00 committed by Michael Johnson
parent 86b4f8dcec
commit 80865ff123
11 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage-create/diskimage-create.sh
View File

@ -333,8 +333,8 @@ AMP_element_sequence="$AMP_element_sequence amphora-agent"
# Add pyroute2 element
AMP_element_sequence="$AMP_element_sequence pyroute2"
# Add the vrrp Octacia element
AMP_element_sequence="$AMP_element_sequence vrrp-octavia"
# Add the keepalived Octavia element
AMP_element_sequence="$AMP_element_sequence keepalived-octavia-ubuntu"
# Allow full elements override
if [ "$DIB_ELEMENTS" ]; then

3
elements/keepalived-octavia-ubuntu/README.rst Normal file
View File

@ -0,0 +1,3 @@
Element to install an Octavia Amphora with keepalived backend.

2
elements/keepalived-octavia-ubuntu/element-deps Normal file
View File

@ -0,0 +1,2 @@
os-svc-install
package-installs

3
elements/keepalived-octavia-ubuntu/package-installs.json Normal file
View File

@ -0,0 +1,3 @@
{
"keepalived/trusty-backports": null
}

7
elements/keepalived-octavia-ubuntu/pre-install.d/00-backports Executable file
View File

@ -0,0 +1,7 @@
#!/bin/bash
# Add the Ubuntu backports archive
set -eu
set -o xtrace
echo deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse > /etc/apt/sources.list.d/backports.list

0
elements/vrrp-octavia/svc-map → elements/keepalived-octavia-ubuntu/svc-map
View File

3
elements/vrrp-octavia/README.rst
View File

@ -1,3 +0,0 @@
Element to install keepalived.

1
elements/vrrp-octavia/element-deps
View File

@ -1 +0,0 @@
source-repositories

11
elements/vrrp-octavia/install.d/77-vrrp
View File

@ -1,11 +0,0 @@
#!/bin/bash
set -eux
# install keepalived dependances.
apt-get --assume-yes install `apt-cache depends keepalived | awk '/Depends:/{print$2}'`
# Checks out keepalived version 1.2.19, compiles and installs binaries.
cd /opt/vrrp-octavia/
git checkout v1.2.19
./configure
make
make install

3
elements/vrrp-octavia/source-repository-vrrp-octavia
View File

@ -1,3 +0,0 @@
# Clone source for keepalived version 1.2.19. Correct version is in
# the installation script
vrrp-octavia git /opt/vrrp-octavia https://github.com/acassen/keepalived

2
octavia/common/constants.py
View File

@ -194,7 +194,7 @@ VRRP_AUTH_DEFAULT = 'PASS'
VRRP_AUTH_AH = 'AH'
SUPPORTED_VRRP_AUTH = (VRRP_AUTH_DEFAULT, VRRP_AUTH_AH)
KEEPALIVED_CMD = '/usr/local/sbin/keepalived '
KEEPALIVED_CMD = '/usr/sbin/keepalived '
# The DEFAULT_VRRP_ID value needs to be variable for multi tenant support
# per amphora in the future
DEFAULT_VRRP_ID = 1