Merge keepalived elements

Change-Id: I2676b26ee59ad18583df937b258549bae241e100

diskimage-create/diskimage-create.sh

@@ -317,22 +317,22 @@ if [ "$AMP_ROOTPW" ]; then
     export DIB_PASSWORD=$AMP_ROOTPW
 fi
 
-# Add the Octavia keepalived, Amphora Agent and Pyroute elements
+# Add the Amphora Agent and Pyroute elements
 if [ "$AMP_BASEOS" = "ubuntu" ]; then
     AMP_element_sequence="$AMP_element_sequence rebind-sshd"
     AMP_element_sequence="$AMP_element_sequence no-resolvconf"
     AMP_element_sequence="$AMP_element_sequence amphora-agent"
-    AMP_element_sequence="$AMP_element_sequence keepalived-octavia-ubuntu"
 elif [ "$AMP_BASEOS" = "rhel" ]; then
     AMP_element_sequence="$AMP_element_sequence no-resolvconf"
     AMP_element_sequence="$AMP_element_sequence amphora-agent-rhel"
-    AMP_element_sequence="$AMP_element_sequence keepalived-octavia"
 else
     AMP_element_sequence="$AMP_element_sequence no-resolvconf"
     AMP_element_sequence="$AMP_element_sequence amphora-agent"
-    AMP_element_sequence="$AMP_element_sequence keepalived-octavia"
 fi
 
+# Add keepalived-octavia element
+AMP_element_sequence="$AMP_element_sequence keepalived-octavia"
+
 # Add pip-cache element
 AMP_element_sequence="$AMP_element_sequence pip-cache"
 

elements/keepalived-octavia-ubuntu/README.rst

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

elements/keepalived-octavia-ubuntu/element-deps

@@ -1,2 +0,0 @@
-package-installs
-pkg-map

elements/keepalived-octavia-ubuntu/package-installs.json

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

elements/keepalived-octavia-ubuntu/svc-map

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

elements/keepalived-octavia/element-deps

@@ -1 +1,2 @@
 package-installs
+pkg-map