Fixes Octavia Amphora RHEL based images

A few elements were needed to define specific repositories.

    amphora-agent: Updated and now buids with sysvinit instead
of upstart Octavia requries the use_upstart parameter to be set
to False to work with RHEL systems.
    amphora-agent-ubuntu: original element that supported upstart
    keepalived-octavia: Supports RHEL repositories

Change-Id: I961663d105ad09e7f05c77cb92efaa469f386fdc
Closes-Bug: #1531092

diskimage-create/diskimage-create.sh

@@ -327,17 +327,18 @@ if [ "$AMP_ROOTPW" ]; then
     export DIB_PASSWORD=$AMP_ROOTPW
 fi
 
-# Add the devstack no-resolvconf hack
-AMP_element_sequence="$AMP_element_sequence no-resolvconf"
-
-# Add the Octavia Amphora agent.py element
-AMP_element_sequence="$AMP_element_sequence amphora-agent"
-
-# Add pyroute2 element
-AMP_element_sequence="$AMP_element_sequence pyroute2"
-
-# Add the keepalived Octavia element
-AMP_element_sequence="$AMP_element_sequence keepalived-octavia-ubuntu"
+# Add the Octavia keepalived, Amphora Agent and Pyroute elements
+if [ "$AMP_BASEOS" = "ubuntu" ]; then
+    AMP_element_sequence="$AMP_element_sequence no-resolvconf"
+    AMP_element_sequence="$AMP_element_sequence amphora-agent-ubuntu"
+    AMP_element_sequence="$AMP_element_sequence pyroute2"
+    AMP_element_sequence="$AMP_element_sequence keepalived-octavia-ubuntu"
+else
+    AMP_element_sequence="$AMP_element_sequence no-resolvconf"
+    AMP_element_sequence="$AMP_element_sequence amphora-agent"
+    AMP_element_sequence="$AMP_element_sequence pyroute2"
+    AMP_element_sequence="$AMP_element_sequence keepalived-octavia"
+fi
 
 # Allow full elements override
 if [ "$DIB_ELEMENTS" ]; then

elements/amphora-agent-ubuntu/README.rst

@@ -0,0 +1,3 @@
+Element to install an Octavia Amphora agent.
+
+

elements/amphora-agent-ubuntu/element-deps

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

elements/amphora-agent-ubuntu/install.d/75-run_setup_install

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -eux
+
+install-packages libffi-dev libssl-dev
+cd /opt/amphora-agent/
+pip install -r requirements.txt
+python setup.py install
+cp etc/init/amphora-agent.conf /etc/init/
+mkdir /etc/octavia
+# we assume certs, etc will come in through the config drive
+mkdir /etc/octavia/certs
+mkdir /var/lib/octavia
+

elements/amphora-agent-ubuntu/source-repository-amphora-agent

@@ -0,0 +1,2 @@
+# This is temporary until we have a pip package
+amphora-agent git /opt/amphora-agent https://review.openstack.org/openstack/octavia

elements/amphora-agent-ubuntu/svc-map

@@ -0,0 +1,2 @@
+amphora-agent:
+  default: amphora-agent

elements/amphora-agent/install.d/75-run_setup_install

@@ -5,7 +5,7 @@ install-packages libffi-dev libssl-dev
 cd /opt/amphora-agent/
 pip install -r requirements.txt
 python setup.py install
-cp etc/init/amphora-agent.conf /etc/init/
+cp etc/initd/amphora-agent /etc/init.d/
 mkdir /etc/octavia
 # we assume certs, etc will come in through the config drive
 mkdir /etc/octavia/certs

elements/keepalived-octavia/README.rst

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

elements/keepalived-octavia/element-deps

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

elements/keepalived-octavia/package-installs.json

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

elements/keepalived-octavia/post-install.d/20-enable-keepalived

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -eu
+set -o pipefail
+
+chkconfig keepalived on

elements/keepalived-octavia/svc-map

@@ -0,0 +1,2 @@
+vrrp-octavia:
+  default: vrrp-octavia