diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index d7b04453ed..353485738f 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -301,18 +301,17 @@ pushd $TEMP > /dev/null if [ "$AMP_BASEOS" = "ubuntu" ]; then AMP_element_sequence=${AMP_element_sequence:-"base vm ubuntu"} - AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND-ubuntu" elif [ "$AMP_BASEOS" = "fedora" ]; then AMP_element_sequence=${AMP_element_sequence:-"base vm fedora selinux-permissive"} - AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND" elif [ "$AMP_BASEOS" = "centos" ]; then AMP_element_sequence=${AMP_element_sequence:-"base vm centos7 selinux-permissive"} - AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND" elif [ "$AMP_BASEOS" = "rhel" ]; then AMP_element_sequence=${AMP_element_sequence:-"base vm rhel7 selinux-permissive"} - AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND" fi +# Add our backend element (haproxy, etc.) +AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND" + if [ "$AMP_ROOTPW" ]; then AMP_element_sequence="$AMP_element_sequence root-passwd" export DIB_PASSWORD=$AMP_ROOTPW @@ -322,7 +321,7 @@ fi 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-ubuntu" + 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" diff --git a/elements/amphora-agent-ubuntu/element-deps b/elements/amphora-agent-ubuntu/element-deps deleted file mode 100644 index 6efeb1fe06..0000000000 --- a/elements/amphora-agent-ubuntu/element-deps +++ /dev/null @@ -1 +0,0 @@ -amphora-agent diff --git a/elements/haproxy-octavia-ubuntu/README.rst b/elements/haproxy-octavia-ubuntu/README.rst deleted file mode 100644 index c986ab7727..0000000000 --- a/elements/haproxy-octavia-ubuntu/README.rst +++ /dev/null @@ -1,3 +0,0 @@ -Element to install an Octavia Amphora with an haproxy backend. - - diff --git a/elements/haproxy-octavia-ubuntu/element-deps b/elements/haproxy-octavia-ubuntu/element-deps deleted file mode 100644 index e267a683cc..0000000000 --- a/elements/haproxy-octavia-ubuntu/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -package-installs -pkg-map -sysctl diff --git a/elements/haproxy-octavia-ubuntu/install.d/76-haproxy b/elements/haproxy-octavia-ubuntu/install.d/76-haproxy deleted file mode 100755 index 36be2ced09..0000000000 --- a/elements/haproxy-octavia-ubuntu/install.d/76-haproxy +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -eux -set -o pipefail - -[ -d /var/lib/haproxy ] || install -d -D -m 0755 -o root -g root /var/lib/haproxy diff --git a/elements/haproxy-octavia-ubuntu/package-installs.json b/elements/haproxy-octavia-ubuntu/package-installs.json deleted file mode 100644 index 6270153dda..0000000000 --- a/elements/haproxy-octavia-ubuntu/package-installs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "haproxy": null -} diff --git a/elements/haproxy-octavia-ubuntu/post-install.d/20-disable-default-haproxy b/elements/haproxy-octavia-ubuntu/post-install.d/20-disable-default-haproxy deleted file mode 100755 index 9db1721251..0000000000 --- a/elements/haproxy-octavia-ubuntu/post-install.d/20-disable-default-haproxy +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -# Doing both here as just remove doesn't seem to work on xenial -update-rc.d haproxy disable || true -update-rc.d -f haproxy remove || true diff --git a/elements/haproxy-octavia-ubuntu/post-install.d/20-haproxy-tune-kernel b/elements/haproxy-octavia-ubuntu/post-install.d/20-haproxy-tune-kernel deleted file mode 100755 index b531fa3412..0000000000 --- a/elements/haproxy-octavia-ubuntu/post-install.d/20-haproxy-tune-kernel +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -sysctl-write-value net.ipv4.tcp_max_tw_buckets 5800000 -sysctl-write-value net.ipv4.tcp_max_orphans 5800000 -sysctl-write-value net.ipv4.tcp_max_syn_backlog 100000 -sysctl-write-value net.ipv4.tcp_keepalive_time 300 -sysctl-write-value net.ipv4.tcp_tw_recycle 0 -sysctl-write-value net.ipv4.tcp_tw_reuse 1 -sysctl-write-value net.core.somaxconn 65534 -sysctl-write-value net.ipv4.tcp_synack_retries 3 -sysctl-write-value net.core.netdev_max_backlog 100000 -sysctl-write-value fs.file-max 1048576 - -# It's ok for these to fail if conntrack module isn't loaded -sysctl-write-value net.netfilter.nf_conntrack_max 131072 || true -sysctl-write-value net.ipv4.netfilter.ip_conntrack_max 1524288 || true -sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_time_wait 5 || true -sysctl-write-value net.ipv4.netfilter.ip_conntrack_tcp_timeout_fin_wait 5 || true - -sysctl-write-value net.ipv4.tcp_fin_timeout 5 -sysctl-write-value net.ipv4.ip_nonlocal_bind 1 -sysctl-write-value net.ipv4.tcp_rmem "16384 65536 524288" -sysctl-write-value net.ipv4.tcp_wmem "16384 349520 699040" -sysctl-write-value net.ipv4.ip_local_port_range "1025 65534" diff --git a/elements/haproxy-octavia-ubuntu/post-install.d/20-haproxy-user-group-config b/elements/haproxy-octavia-ubuntu/post-install.d/20-haproxy-user-group-config deleted file mode 100755 index 0fb982540a..0000000000 --- a/elements/haproxy-octavia-ubuntu/post-install.d/20-haproxy-user-group-config +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -eu -set -o pipefail - -case $DISTRO_NAME in - ubuntu | debian ) - HAPROXY_USER_GROUP=nogroup - ;; - fedora | centos* | rhel* ) - HAPROXY_USER_GROUP=haproxy - ;; - *) - HAPROXY_USER_GROUP=nogroup - ;; -esac - -cat >> /var/lib/octavia/haproxy-default-user-group.conf <> /etc/rsyslog.d/49-haproxy.conf <