diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-11-29 10:39:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-29 10:39:42 -0500 |
| commit | 4c2a6db2b968abdf7ab641340700856ff179e8e3 (patch) | |
| tree | 1e1f99b1a04e7b95f14c20ea3333b74d8cfc4b9d /roles/openshift_loadbalancer | |
| parent | 244132714dac209ebebe9141a58da5d2e9f1bb13 (diff) | |
| parent | ec9c22ca6a376b7d1139a384dcb78f3f5bb5b607 (diff) | |
| download | openshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.tar.gz openshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.tar.bz2 openshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.tar.xz openshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.zip | |
Merge pull request #2868 from mtnbikenc/systemd-refactor
Refactored to use Ansible systemd module
Diffstat (limited to 'roles/openshift_loadbalancer')
| -rw-r--r-- | roles/openshift_loadbalancer/README.md | 2 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 8 |
4 files changed, 6 insertions, 8 deletions
diff --git a/roles/openshift_loadbalancer/README.md b/roles/openshift_loadbalancer/README.md index 03e837e46..bea4c509b 100644 --- a/roles/openshift_loadbalancer/README.md +++ b/roles/openshift_loadbalancer/README.md @@ -6,6 +6,8 @@ OpenShift HaProxy Loadbalancer Configuration Requirements ------------ +* Ansible 2.2 + This role is intended to be applied to the [lb] host group which is separate from OpenShift infrastructure components. diff --git a/roles/openshift_loadbalancer/handlers/main.yml b/roles/openshift_loadbalancer/handlers/main.yml index 5b8691b26..3bf052460 100644 --- a/roles/openshift_loadbalancer/handlers/main.yml +++ b/roles/openshift_loadbalancer/handlers/main.yml @@ -1,6 +1,6 @@ --- - name: restart haproxy - service: + systemd: name: haproxy state: restarted when: not (haproxy_start_result_changed | default(false) | bool) diff --git a/roles/openshift_loadbalancer/meta/main.yml b/roles/openshift_loadbalancer/meta/main.yml index 0b29df2a0..0dffb545f 100644 --- a/roles/openshift_loadbalancer/meta/main.yml +++ b/roles/openshift_loadbalancer/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: description: OpenShift haproxy loadbalancer company: Red Hat, Inc. license: Apache License, Version 2.0 - min_ansible_version: 1.9 + min_ansible_version: 2.2 platforms: - name: EL versions: diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml index 1d2804279..400f80715 100644 --- a/roles/openshift_loadbalancer/tasks/main.yml +++ b/roles/openshift_loadbalancer/tasks/main.yml @@ -27,11 +27,6 @@ option: LimitNOFILE value: "{{ openshift_loadbalancer_limit_nofile | default(100000) }}" 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: @@ -43,10 +38,11 @@ notify: restart haproxy - name: Enable and start haproxy - service: + systemd: name: haproxy state: started enabled: yes + daemon_reload: yes register: start_result - set_fact: |