From: Sage Weil <sage@newdream.net>
Date: Wed, 14 Apr 2021 16:47:54 +0000 (-0500)
Subject: mgr/cephadm: remove old haproxy and keepalived templates
X-Git-Tag: v17.1.0~2235^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0536364645ff06f285c3dd698df02898a920f1b9;p=ceph-ci.git

mgr/cephadm: remove old haproxy and keepalived templates

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/templates/services/haproxy/haproxy.cfg.j2 b/src/pybind/mgr/cephadm/templates/services/haproxy/haproxy.cfg.j2
deleted file mode 100644
index 3cc51278f1c..00000000000
--- a/src/pybind/mgr/cephadm/templates/services/haproxy/haproxy.cfg.j2
+++ /dev/null
@@ -1,66 +0,0 @@
-# {{ cephadm_managed }}
-global
-    log         127.0.0.1 local2
-    chroot      /var/lib/haproxy
-    pidfile     /var/lib/haproxy/haproxy.pid
-    maxconn     8000
-    daemon
-    stats socket /var/lib/haproxy/stats
-{% if spec.ha_proxy_frontend_ssl_certificate %}
-  {% if spec.ha_proxy_ssl_dh_param %}
-    tune.ssl.default-dh-param {{ spec.ha_proxy_ssl_dh_param }}
-  {% endif %}
-  {% if spec.ha_proxy_ssl_ciphers %}
-    ssl-default-bind-ciphers {{ spec.ha_proxy_ssl_ciphers | join(':') }}
-  {% endif %}
-  {% if spec.ha_proxy_ssl_options %}
-    ssl-default-bind-options {{ spec.ha_proxy_ssl_options | join(' ') }}
-  {% endif %}
-{% endif %}
-
-defaults
-    mode                    http
-    log                     global
-    option                  httplog
-    option                  dontlognull
-    option http-server-close
-    option forwardfor       except 127.0.0.0/8
-    option                  redispatch
-    retries                 3
-    timeout http-request    1s
-    timeout queue           20s
-    timeout connect         5s
-    timeout client          1s
-    timeout server          1s
-    timeout http-keep-alive 5s
-    timeout check           5s
-    maxconn                 8000
-
-frontend stats
-    bind *:{{ spec.ha_proxy_port }}
-{% if spec.ha_proxy_stats_enabled %}
-    stats enable
-{% endif %}
-    stats uri /stats
-    stats refresh 10s
-    stats auth {{ spec.ha_proxy_stats_user }}:{{ spec.ha_proxy_stats_password }}
-{% if spec.ha_proxy_enable_prometheus_exporter %}
-    http-request use-service prometheus-exporter if { path /metrics }
-{% endif %}
-    monitor-uri {{ spec.ha_proxy_monitor_uri }}
-
-frontend rgw-frontend
-{% if spec.ha_proxy_frontend_ssl_certificate %}
-    bind {{ virtual_ip_address }}:{{ spec.ha_proxy_frontend_ssl_port }} ssl crt /var/lib/haproxy/haproxy.pem
-{% else %}
-    bind {{ virtual_ip_address }}:{{ spec.frontend_port }}
-{% endif %}
-    default_backend rgw-backend
-
-backend rgw-backend
-    option forwardfor
-    balance static-rr
-    option httpchk HEAD / HTTP/1.0
-    {% for server in rgw_servers %}
-    server {{ server.name }} {{ server.ip }}:{{ server.port }} check weight 100
-    {% endfor %}
diff --git a/src/pybind/mgr/cephadm/templates/services/keepalived/keepalived.conf.j2 b/src/pybind/mgr/cephadm/templates/services/keepalived/keepalived.conf.j2
deleted file mode 100644
index e7a066244ce..00000000000
--- a/src/pybind/mgr/cephadm/templates/services/keepalived/keepalived.conf.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-# {{ cephadm_managed }}
-vrrp_script check_haproxy {
-    script "curl http://localhost:{{ spec.ha_proxy_port }}/haproxy_test"
-    weight -20
-    interval 2
-    rise 2
-    fall 2
-}
-
-vrrp_instance VI_0 {
-  state {{ state }}
-  priority 100
-  interface {{ spec.virtual_ip_interface }}
-  virtual_router_id 51
-  advert_int 1
-  authentication {
-      auth_type PASS
-      auth_pass {{ spec.keepalived_password }}
-  }
-  unicast_src_ip {{ host_ip }}
-  unicast_peer {
-    {% for ip in other_ips  %}
-    {{ ip }}
-    {% endfor %}
-  }
-  virtual_ipaddress {
-    {{ spec.virtual_ip_address }} dev {{ spec.virtual_ip_interface }}
-  }
-  track_script {
-      check_haproxy
-  }
-}