diff --git a/inventory/group_vars/haproxy/keepalived.yml b/inventory/group_vars/haproxy/keepalived.yml index 07cb05bac6..3b5e7488f1 100644 --- a/inventory/group_vars/haproxy/keepalived.yml +++ b/inventory/group_vars/haproxy/keepalived.yml @@ -18,17 +18,6 @@ keepalived_ping_interval: 10 keepalived_ubuntu_src: "native" keepalived_ping_address: "{{ ansible_default_ipv4['gateway'] | default('127.0.0.1') }}" -keepalived_sync_groups: - haproxy: - instances: - - external - - internal - notify_script: /etc/keepalived/haproxy_notify.sh - ##if a src_*_script is defined, it will be uploaded from src_*_script - ##on the deploy host to the *_script location. Make sure *_script is - ##a location in that case. - src_notify_script: "{{ playbook_dir }}/../scripts/keepalived_haproxy_notifications.sh" - keepalived_global_defs: - "enable_script_security" - script_user root diff --git a/scripts/keepalived_haproxy_notifications.sh b/scripts/keepalived_haproxy_notifications.sh deleted file mode 100644 index 1d6bead9fb..0000000000 --- a/scripts/keepalived_haproxy_notifications.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Copyright 2015, Jean-Philippe Evrard -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -TYPE=$1 -NAME=$2 -NOW=`date "+%Y-%m-%d %H:%M:%S"` -NEWSTATE=$3 -OLDSTATE=$(cat /var/run/keepalived.state) - -echo "$NEWSTATE" > /var/run/keepalived.state - -case $NEWSTATE in - "FAULT") echo "$NOW Trying to restart haproxy to get out"\ - "of faulty state" >> /var/log/keepalived-notifications.log - /etc/init.d/haproxy stop - /etc/init.d/haproxy start - exit 0 - ;; - *) echo "$NOW Unknown state" >> /var/log/keepalived-notifications.log - exit 1 - ;; -esac