Separate master and haproxy config playbooks.

* Move haproxy configuration to a separate openshift-loadbalancer play.
* Move the haproxy role to openshift_loadbalancer.
* Add openshift_loadbalancer* facts which drive haproxy configuration.

6 files changed, 0 insertions, 195 deletions

diff --git a/roles/haproxy/README.md b/roles/haproxy/README.md
deleted file mode 100644
index 5bc415066..000000000
--- a/roles/haproxy/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-HAProxy
-=======
-
-TODO
-
-Requirements
-------------
-
-TODO
-
-Role Variables
---------------
-
-TODO
-
-Dependencies
-------------
-
-TODO
-
-Example Playbook
-----------------
-
-TODO
-
-License
--------
-
-Apache License, Version 2.0
-
-Author Information
-------------------
-
-Jason DeTiberus (jdetiber@redhat.com)
diff --git a/roles/haproxy/defaults/main.yml b/roles/haproxy/defaults/main.yml
deleted file mode 100644
index a1524cfe1..000000000
--- a/roles/haproxy/defaults/main.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-haproxy_frontend_port: 80
-
-haproxy_frontends:
-- name: main
-  binds:
-  - "*:80"
-  default_backend: default
-
-haproxy_backends:
-- name: default
-  balance: roundrobin
-  servers:
-  - name: web01
-    address: 127.0.0.1:9000
-    opts: check
-
-os_firewall_allow:
-- service: haproxy stats
-  port: "9000/tcp"
-- service: haproxy balance
-  port: "{{ haproxy_frontend_port }}/tcp"
diff --git a/roles/haproxy/handlers/main.yml b/roles/haproxy/handlers/main.yml
deleted file mode 100644
index 5b8691b26..000000000
--- a/roles/haproxy/handlers/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: restart haproxy
-  service:
-    name: haproxy
-    state: restarted
-  when: not (haproxy_start_result_changed | default(false) | bool)
diff --git a/roles/haproxy/meta/main.yml b/roles/haproxy/meta/main.yml
deleted file mode 100644
index 0fad106a9..000000000
--- a/roles/haproxy/meta/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-galaxy_info:
-  author: Jason DeTiberus
-  description: HAProxy
-  company: Red Hat, Inc.
-  license: Apache License, Version 2.0
-  min_ansible_version: 1.9
-  platforms:
-  - name: EL
-    versions:
-    - 7
-dependencies:
-- { role: os_firewall }
-- { role: openshift_repos }
diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml
deleted file mode 100644
index 837fa67db..000000000
--- a/roles/haproxy/tasks/main.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-- name: Install haproxy
-  action: "{{ ansible_pkg_mgr }} name=haproxy state=present"
-  when: not openshift.common.is_containerized | bool
-
-- name: Configure systemd service directory for haproxy
-  file:
-    path: /etc/systemd/system/haproxy.service.d
-    state: directory
-  when: haproxy_limit_nofile is defined
-
-- name: Configure the nofile limits for haproxy
-  ini_file:
-    dest: /etc/systemd/system/haproxy.service.d/limits.conf
-    section: Service
-    option: LimitNOFILE
-    value: "{{ haproxy_limit_nofile }}"
-  when: haproxy_limit_nofile is defined
-  notify: restart haproxy
-  register: nofile_limit_result
-
-- name: Reload systemd if needed
-  command: systemctl daemon-reload
-  when: nofile_limit_result | changed
-
-- name: Configure haproxy
-  template:
-    src: haproxy.cfg.j2
-    dest: /etc/haproxy/haproxy.cfg
-    owner: root
-    group: root
-    mode: 0644
-  notify: restart haproxy
-
-- name: Enable and start haproxy
-  service:
-    name: haproxy
-    state: started
-    enabled: yes
-  register: start_result
-
-- set_fact:
-    haproxy_start_result_changed: "{{ start_result | changed }}"
diff --git a/roles/haproxy/templates/haproxy.cfg.j2 b/roles/haproxy/templates/haproxy.cfg.j2
deleted file mode 100644
index cb4380971..000000000
--- a/roles/haproxy/templates/haproxy.cfg.j2
+++ /dev/null
@@ -1,76 +0,0 @@
-# Global settings
-#---------------------------------------------------------------------
-global
-    chroot      /var/lib/haproxy
-    pidfile     /var/run/haproxy.pid
-    maxconn     {{ haproxy_global_maxconn | default('4000') }}
-    user        haproxy
-    group       haproxy
-    daemon
-
-    # turn on stats unix socket
-    stats socket /var/lib/haproxy/stats
-
-#---------------------------------------------------------------------
-# common defaults that all the 'listen' and 'backend' sections will
-# use if not designated in their block
-#---------------------------------------------------------------------
-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    10s
-    timeout queue           1m
-    timeout connect         10s
-    timeout client          300s
-    timeout server          300s
-    timeout http-keep-alive 10s
-    timeout check           10s
-    maxconn                 {{ haproxy_default_maxconn | default('3000') }}
-
-listen stats :9000
-    mode http
-    stats enable
-    stats uri /
-
-{% for frontend in haproxy_frontends %}
-frontend  {{ frontend.name }}
-{% for bind in frontend.binds %}
-    bind {{ bind }}
-{% endfor %}
-    default_backend {{ frontend.default_backend }}
-{% if 'mode' in frontend %}
-    mode {{ frontend.mode }}
-{% endif %}
-{% if 'options' in frontend %}
-{% for option in frontend.options %}
-    option {{ option }}
-{% endfor %}
-{% endif %}
-{% if 'redirects' in frontend %}
-{% for redirect in frontend.redirects %}
-    redirect {{ redirect }}
-{% endfor %}
-{% endif %}
-{% endfor %}
-
-{% for backend in haproxy_backends %}
-backend {{ backend.name }}
-    balance {{ backend.balance }}
-{% if 'mode' in backend %}
-    mode {{ backend.mode }}
-{% endif %}
-{% if 'options' in backend %}
-{% for option in backend.options %}
-    option {{ option }}
-{% endfor %}
-{% endif %}
-{% for server in backend.servers %}
-    server      {{ server.name }} {{ server.address }} {{ server.opts }}
-{% endfor %}
-{% endfor %}