coryHawkvelt/docker-keepalived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix startup.sh and finish.sh ip address removal

Browse Source
This commit is contained in:
Bertrand Gouny
2017-04-02 13:18:52 +02:00
parent ea3a6095bc
commit 0b2ba5f4bf
6 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/service/keepalived/assets/keepalived.conf
+11 -7
View File
@@ -1,27 +1,31 @@
global_defs {
default_interface {{ KEEPALIVED_INTERFACE }}
}
vrrp_instance VI_1 {
interface {{ keepalived_interface }}
interface {{ KEEPALIVED_INTERFACE }}
track_interface {
{{ keepalived_interface }}
{{ KEEPALIVED_INTERFACE }}
}
state BACKUP
virtual_router_id 51
priority {{ keepalived_priority }}
priority {{ KEEPALIVED_PRIORITY }}
nopreempt
unicast_peer {
{{ keepalived_unicast_peers }}
{{ KEEPALIVED_UNICAST_PEERS }}
}
virtual_ipaddress {
{{ keepalived_virtual_ips }}
{{ KEEPALIVED_VIRTUAL_IPS }}
}
authentication {
auth_type PASS
auth_pass {{ keepalived_password }}
auth_pass {{ KEEPALIVED_PASSWORD }}
}
{{ keepalived_notify }}
{{ KEEPALIVED_NOTIFY }}
}
image/service/keepalived/finish.sh
+1 -1
View File
@@ -7,7 +7,7 @@ log-helper level eq trace && set -x
# try to delete virtual ips from interface
for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
do
ip addr del ${vip}/32 dev ${KEEPALIVED_INTERFACE} || true
ip addr del ${!vip}/32 dev ${KEEPALIVED_INTERFACE} || true
done
exit 0
image/service/keepalived/startup.sh
+11 -11
View File
@@ -11,30 +11,30 @@ if [ ! -e "$FIRST_START_DONE" ]; then
#
# bootstrap config
#
sed -i --follow-symlinks "s|{{ keepalived_interface }}|$KEEPALIVED_INTERFACE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ keepalived_priority }}|$KEEPALIVED_PRIORITY|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ keepalived_password }}|$KEEPALIVED_PASSWORD|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ KEEPALIVED_INTERFACE }}|$KEEPALIVED_INTERFACE|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ KEEPALIVED_PRIORITY }}|$KEEPALIVED_PRIORITY|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ KEEPALIVED_PASSWORD }}|$KEEPALIVED_PASSWORD|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
if [ -n "$KEEPALIVED_NOTIFY" ]; then
sed -i --follow-symlinks "s|{{ keepalived_notify }}|notify \"$KEEPALIVED_NOTIFY\"|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ KEEPALIVED_NOTIFY }}|notify \"$KEEPALIVED_NOTIFY\"|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
chmod +x $KEEPALIVED_NOTIFY
else
sed -i --follow-symlinks "/{{ keepalived_notify }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "/{{ KEEPALIVED_NOTIFY }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
fi
# unicast peers
for peer in $(complex-bash-env iterate KEEPALIVED_UNICAST_PEERS)
do
sed -i --follow-symlinks "s|{{ keepalived_unicast_peers }}|${!peer}\n {{ keepalived_unicast_peers }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ KEEPALIVED_UNICAST_PEERS }}|${!peer}\n {{ KEEPALIVED_UNICAST_PEERS }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
done
sed -i --follow-symlinks "/{{ keepalived_unicast_peers }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "/{{ KEEPALIVED_UNICAST_PEERS }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
# virtual ips
for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
do
sed -i --follow-symlinks "s|{{ keepalived_virtual_ips }}|${!vip}\n {{ keepalived_virtual_ips }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "s|{{ KEEPALIVED_VIRTUAL_IPS }}|${!vip}\n {{ KEEPALIVED_VIRTUAL_IPS }}|g" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
done
sed -i --follow-symlinks "/{{ keepalived_virtual_ips }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
sed -i --follow-symlinks "/{{ KEEPALIVED_VIRTUAL_IPS }}/d" ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf
touch $FIRST_START_DONE
fi
@@ -42,10 +42,10 @@ fi
# try to delete virtual ips from interface
for vip in $(complex-bash-env iterate KEEPALIVED_VIRTUAL_IPS)
do
ip addr del ${vip}/32 dev ${KEEPALIVED_INTERFACE} || true
ip addr del ${!vip}/32 dev ${KEEPALIVED_INTERFACE} || true
done
if [ ! -e "/etc/backup-manager.conf" ]; then
if [ ! -e "/etc/keepalived/keepalived.conf" ]; then
ln -sf ${CONTAINER_SERVICE_DIR}/keepalived/assets/keepalived.conf /etc/keepalived/keepalived.conf
fi