Merge "Fixing haproxy-playbook fails when installing on multiple hosts"

This commit is contained in:
Jenkins 2015-09-02 22:55:41 +00:00 committed by Gerrit Code Review
commit b2f8a07e72
4 changed files with 13 additions and 1 deletions

View File

@ -226,3 +226,6 @@ swift_system_shell: /bin/bash
swift_system_comment: swift system user
swift_system_home_folder: "/var/lib/{{ swift_system_user_name }}"
swift_service_region: "{{ service_region }}"
## HAProxy
haproxy_bind_on_non_local: "{% if groups.haproxy_hosts[1] is defined and internal_lb_vip_address != external_lb_vip_address %}True{% else %}False{% endif %}"

View File

@ -67,6 +67,7 @@ haproxy_backup_nodes: []
# - "httplog"
galera_monitoring_user: monitoring
haproxy_bind_on_non_local: False
## haproxy SSL
haproxy_ssl: no

View File

@ -24,7 +24,7 @@
tags:
- haproxy-apt-packages
- name: Install HAPRoxy Packages
- name: Install HAProxy Packages
apt:
pkg: "{{ item }}"
state: latest

View File

@ -13,6 +13,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Make haproxy bindable on non local addresses
sysctl:
name: net.ipv4.ip_nonlocal_bind
value: 1
sysctl_set: yes
state: present
when: haproxy_bind_on_non_local | bool
- name: Drop base haproxy config
template:
src: "{{ item }}"