Merge "Remove config-internal for keepalived"

This commit is contained in:
Jenkins 2015-08-09 17:19:19 +00:00 committed by Gerrit Code Review
commit 3d10fff689
7 changed files with 3 additions and 58 deletions

3
docker/centos/binary/keepalived/Dockerfile Executable file → Normal file
View File

@ -7,8 +7,7 @@ RUN yum -y install \
socat \ socat \
&& yum clean all && yum clean all
COPY keepalived.conf /etc/keepalived/
COPY start.sh check_alive.sh / COPY start.sh check_alive.sh /
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

View File

@ -1 +0,0 @@
../../../common/keepalived/config-internal.sh

View File

@ -1 +0,0 @@
../../../common/keepalived/keepalived.conf

View File

@ -1,31 +0,0 @@
#!/bin/bash
. /opt/kolla/kolla-common.sh
check_required_vars KEEPALIVED_HOST_PRIORITIES \
PUBLIC_INTERFACE \
PUBLIC_IP
MY_HOSTNAME=`hostname`
# here we unpack KEEPALIVED_HOST_PRIORITIES hostname:priority pairs and match
# them with current hostname, if it's there
for i in ${KEEPALIVED_HOST_PRIORITIES//,/ }; do
HOST_PRIORITY=(${i//:/ })
if [ "$MY_HOSTNAME" == "${HOST_PRIORITY[0]}" ]; then
KEEPALIVED_PRIORITY=${HOST_PRIORITY[1]}
fi
done
if [ -z "$KEEPALIVED_PRIORITY" ]; then
echo "ERROR: missing hostname in KEEPALIVED_HOST_PRIORITIES: $MY_HOSTNAME" >&2
exit 1
fi
sed -i '
s|@PUBLIC_INTERFACE@|'$PUBLIC_INTERFACE'|g
s|@PUBLIC_IP@|'$PUBLIC_IP'|g
s|@KEEPALIVED_PRIORITY@|'$KEEPALIVED_PRIORITY'|g
' /etc/keepalived/keepalived.conf
exec /usr/sbin/keepalived -nld -p /run/keepalived.pid

View File

@ -1,19 +0,0 @@
vrrp_script check_alive {
script "/check_alive.sh"
interval 2
weight -10
}
vrrp_instance Floating {
state MASTER
interface @PUBLIC_INTERFACE@
virtual_router_id 51
priority @KEEPALIVED_PRIORITY@
advert_int 1
virtual_ipaddress {
@PUBLIC_IP@
}
track_script {
check_alive
}
}

View File

@ -7,7 +7,7 @@ ARGS="-nld -p /run/keepalived.pid"
# Loading common functions. # Loading common functions.
source /opt/kolla/kolla-common.sh source /opt/kolla/kolla-common.sh
# Config-internal script exec out of this function, it does not return here. # Execute config strategy
set_configs set_configs
exec $CMD $ARGS exec $CMD $ARGS

View File

@ -267,9 +267,7 @@ In order for each service to function, there is a minimum set of required variab
# Keepalived # Keepalived
KEEPALIVED_HOST_PRIORITIES None
PUBLIC_INTERFACE
PUBLIC_IP
# Keystone # Keystone