Browse Source

Redis: Remove leftover of Sentinel support

Support for Redis Sentinel was removed by[1] because it has never
really used in TripleO deployments.

[1] a67a36b18c

Change-Id: I5c93a8800348f56f58d2d40f3e97552580b75c2a
changes/84/817884/1
Takashi Kajinami 2 months ago
parent
commit
242044d859
  1. 38
      manifests/redis_notification.pp
  2. 30
      templates/redis/redis-notifications.sh.erb

38
manifests/redis_notification.pp

@ -1,38 +0,0 @@
# Copyright 2015 Red Hat, Inc.
# All Rights Reserved.
#
# 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.
#
# == Class: tripleo::redis_notification
#
# Configure the Redis notification script that talks to HAProxy
#
# === Parameters:
#
# [*haproxy_monitor_ip*]
# (String) IP address on which HAProxy is listening on
# Defaults to 127.0.0.1
#
class tripleo::redis_notification (
$haproxy_monitor_ip = '127.0.0.1',
) {
file { '/usr/local/bin/redis-notifications.sh' :
ensure => file,
content => template('tripleo/redis/redis-notifications.sh.erb'),
owner => 'root',
group => 'root',
mode => '0755',
}
}

30
templates/redis/redis-notifications.sh.erb

@ -1,30 +0,0 @@
#!/bin/bash
HAPROXY="<%= @haproxy_monitor_ip %>:1993"
CMD="$1"
ARGS="$2"
ARG1=`echo $ARGS | awk '{print $1}'`
call_curl () {
DATA=`echo "s=$1&action=$2&b=%234" | sed -e s/:/%3A/`
curl -g --silent -o /dev/null $HAPROXY --data "$DATA"
echo curl $HAPROXY --data "$DATA"
return 0
}
[ "$CMD" = "+odown" ] && [ "$ARG1" = "master" ] && \
call_curl `echo $ARGS | awk '{print $2 ":" $3 ":" $4}'` 'disable'
[ "$CMD" = "+sdown" ] && [ "$ARG1" = "slave" ] && \
call_curl `echo $ARGS | awk '{print $6 ":" $3 ":" $4}'` 'disable'
[ "$CMD" = "+switch-master" ] && \
call_curl `echo $ARGS | awk '{print $1 ":" $4 ":" $5}'` 'enable' &&
call_curl `echo $ARGS | awk '{print $1 ":" $2 ":" $3}'` 'disable'
[ "$CMD" = "-odown" ] && [ "$ARG1" = "master" ] && \
call_curl `echo $ARGS | awk '{print $2 ":" $3 ":" $4}'` 'enable'
# without exit code, sentinel thinks the script is still running and locks any further execution
exit 0
Loading…
Cancel
Save