diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index 3df5ad113d..0af2f3a4d5 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -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 diff --git a/elements/keepalived-octavia-ubuntu/README.rst b/elements/keepalived-octavia-ubuntu/README.rst new file mode 100644 index 0000000000..c196323346 --- /dev/null +++ b/elements/keepalived-octavia-ubuntu/README.rst @@ -0,0 +1,3 @@ +Element to install an Octavia Amphora with keepalived backend. + + diff --git a/elements/keepalived-octavia-ubuntu/element-deps b/elements/keepalived-octavia-ubuntu/element-deps new file mode 100644 index 0000000000..29e4e2426c --- /dev/null +++ b/elements/keepalived-octavia-ubuntu/element-deps @@ -0,0 +1,2 @@ +os-svc-install +package-installs diff --git a/elements/keepalived-octavia-ubuntu/package-installs.json b/elements/keepalived-octavia-ubuntu/package-installs.json new file mode 100644 index 0000000000..aba7c57226 --- /dev/null +++ b/elements/keepalived-octavia-ubuntu/package-installs.json @@ -0,0 +1,3 @@ +{ + "keepalived/trusty-backports": null +} diff --git a/elements/keepalived-octavia-ubuntu/pre-install.d/00-backports b/elements/keepalived-octavia-ubuntu/pre-install.d/00-backports new file mode 100755 index 0000000000..6f284bd487 --- /dev/null +++ b/elements/keepalived-octavia-ubuntu/pre-install.d/00-backports @@ -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 diff --git a/elements/vrrp-octavia/svc-map b/elements/keepalived-octavia-ubuntu/svc-map similarity index 100% rename from elements/vrrp-octavia/svc-map rename to elements/keepalived-octavia-ubuntu/svc-map diff --git a/elements/vrrp-octavia/README.rst b/elements/vrrp-octavia/README.rst deleted file mode 100644 index 3db03dc16b..0000000000 --- a/elements/vrrp-octavia/README.rst +++ /dev/null @@ -1,3 +0,0 @@ -Element to install keepalived. - - diff --git a/elements/vrrp-octavia/element-deps b/elements/vrrp-octavia/element-deps deleted file mode 100644 index 715c11e2f5..0000000000 --- a/elements/vrrp-octavia/element-deps +++ /dev/null @@ -1 +0,0 @@ -source-repositories diff --git a/elements/vrrp-octavia/install.d/77-vrrp b/elements/vrrp-octavia/install.d/77-vrrp deleted file mode 100755 index 4647f0bfd7..0000000000 --- a/elements/vrrp-octavia/install.d/77-vrrp +++ /dev/null @@ -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 diff --git a/elements/vrrp-octavia/source-repository-vrrp-octavia b/elements/vrrp-octavia/source-repository-vrrp-octavia deleted file mode 100644 index 732f7ed097..0000000000 --- a/elements/vrrp-octavia/source-repository-vrrp-octavia +++ /dev/null @@ -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 diff --git a/octavia/common/constants.py b/octavia/common/constants.py index c874a97f5d..e29ea747a8 100644 --- a/octavia/common/constants.py +++ b/octavia/common/constants.py @@ -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