From e9cdb4d014bc20ce680c6019bdaf011f2190114c Mon Sep 17 00:00:00 2001 From: Vishal Patil Date: Mon, 26 Sep 2016 18:28:07 -0400 Subject: Changes for Nuage HA --- roles/openshift_loadbalancer_facts/meta/main.yml | 3 ++- roles/openshift_loadbalancer_facts/tasks/main.yml | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) (limited to 'roles/openshift_loadbalancer_facts') diff --git a/roles/openshift_loadbalancer_facts/meta/main.yml b/roles/openshift_loadbalancer_facts/meta/main.yml index 4c5b6552b..46959355b 100644 --- a/roles/openshift_loadbalancer_facts/meta/main.yml +++ b/roles/openshift_loadbalancer_facts/meta/main.yml @@ -10,4 +10,5 @@ galaxy_info: versions: - 7 dependencies: -- role: openshift_facts + - role: openshift_facts + - role: nuage_common diff --git a/roles/openshift_loadbalancer_facts/tasks/main.yml b/roles/openshift_loadbalancer_facts/tasks/main.yml index dc244c0be..5936ce5ba 100644 --- a/roles/openshift_loadbalancer_facts/tasks/main.yml +++ b/roles/openshift_loadbalancer_facts/tasks/main.yml @@ -20,6 +20,14 @@ binds: - "*:{{ openshift.loadbalancer.frontend_port }}" default_backend: atomic-openshift-api + - name: nuage-monitor + mode: tcp + options: + - tcplog + binds: + - "*:{{ nuage_mon_rest_server_port }}" + default_backend: nuage-monitor + when: openshift.common.use_nuage | bool backends: - name: atomic-openshift-api mode: tcp @@ -28,3 +36,11 @@ servers: "{{ hostvars | oo_select_keys(groups['oo_masters']) | oo_haproxy_backend_masters(openshift.loadbalancer.frontend_port) }}" + - name: nuage-monitor + mode: tcp + option: tcplog + balance: source + servers: "{{ hostvars + | oo_select_keys(groups['oo_masters']) + | oo_haproxy_backend_masters(nuage_mon_rest_server_port) }}" + when: openshift.common.use_nuage | bool -- cgit v1.2.3 From e297a8c887c6fd1ba880a6977fdfe50a3a1ea2ee Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Mon, 3 Oct 2016 11:28:44 -0400 Subject: Filterize haproxy frontends/backends and add method for providing additional frontends/backends. --- roles/openshift_loadbalancer_facts/README.md | 34 ----------------- roles/openshift_loadbalancer_facts/meta/main.yml | 14 ------- roles/openshift_loadbalancer_facts/tasks/main.yml | 46 ----------------------- 3 files changed, 94 deletions(-) delete mode 100644 roles/openshift_loadbalancer_facts/README.md delete mode 100644 roles/openshift_loadbalancer_facts/meta/main.yml delete mode 100644 roles/openshift_loadbalancer_facts/tasks/main.yml (limited to 'roles/openshift_loadbalancer_facts') diff --git a/roles/openshift_loadbalancer_facts/README.md b/roles/openshift_loadbalancer_facts/README.md deleted file mode 100644 index 57537cc03..000000000 --- a/roles/openshift_loadbalancer_facts/README.md +++ /dev/null @@ -1,34 +0,0 @@ -OpenShift HAProxy Loadbalancer Facts -==================================== - -TODO - -Requirements ------------- - -TODO - -Role Variables --------------- - -TODO - -Dependencies ------------- - -TODO - -Example Playbook ----------------- - -TODO - -License -------- - -Apache License, Version 2.0 - -Author Information ------------------- - -Andrew Butcher (abutcher@redhat.com) diff --git a/roles/openshift_loadbalancer_facts/meta/main.yml b/roles/openshift_loadbalancer_facts/meta/main.yml deleted file mode 100644 index 46959355b..000000000 --- a/roles/openshift_loadbalancer_facts/meta/main.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -galaxy_info: - author: Andrew Butcher - description: OpenShift loadbalancer facts - company: Red Hat, Inc. - license: Apache License, Version 2.0 - min_ansible_version: 1.9 - platforms: - - name: EL - versions: - - 7 -dependencies: - - role: openshift_facts - - role: nuage_common diff --git a/roles/openshift_loadbalancer_facts/tasks/main.yml b/roles/openshift_loadbalancer_facts/tasks/main.yml deleted file mode 100644 index 5936ce5ba..000000000 --- a/roles/openshift_loadbalancer_facts/tasks/main.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- name: Set haproxy frontend port - openshift_facts: - role: loadbalancer - local_facts: - frontend_port: "{{ openshift_master_api_port | default(None) }}" - -- name: Set loadbalancer facts - openshift_facts: - role: loadbalancer - local_facts: - limit_nofile: "{{ openshift_loadbalancer_limit_nofile | default(None) }}" - default_maxconn: "{{ openshift_loadbalancer_default_maxconn | default(None) }}" - global_maxconn: "{{ openshift_loadbalancer_global_maxconn | default(None) }}" - frontends: - - name: atomic-openshift-api - mode: tcp - options: - - tcplog - binds: - - "*:{{ openshift.loadbalancer.frontend_port }}" - default_backend: atomic-openshift-api - - name: nuage-monitor - mode: tcp - options: - - tcplog - binds: - - "*:{{ nuage_mon_rest_server_port }}" - default_backend: nuage-monitor - when: openshift.common.use_nuage | bool - backends: - - name: atomic-openshift-api - mode: tcp - option: tcplog - balance: source - servers: "{{ hostvars - | oo_select_keys(groups['oo_masters']) - | oo_haproxy_backend_masters(openshift.loadbalancer.frontend_port) }}" - - name: nuage-monitor - mode: tcp - option: tcplog - balance: source - servers: "{{ hostvars - | oo_select_keys(groups['oo_masters']) - | oo_haproxy_backend_masters(nuage_mon_rest_server_port) }}" - when: openshift.common.use_nuage | bool -- cgit v1.2.3