diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-16 00:32:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-16 00:32:10 +0000 |
| commit | 25a33ca0dc54b424142532f82b4d4846db493471 (patch) | |
| tree | b1c75a8d9087512e3f483d45b78fe4fa6d391f51 | |
| parent | db27136ed5de40a81f8463cb1a5ee06545c3e009 (diff) | |
| parent | 22fe11840ba738c045c3dce1bad840ce28c4b5b4 (diff) | |
| download | kolla-25a33ca0dc54b424142532f82b4d4846db493471.tar.gz kolla-25a33ca0dc54b424142532f82b4d4846db493471.zip | |
Merge "Move sysctl out of haproxy container"
| -rw-r--r-- | ansible/roles/haproxy/tasks/config.yml | 7 | ||||
| -rw-r--r-- | docker/haproxy/extend_start.sh | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml index 887af1aa5..50d324671 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -1,6 +1,9 @@ --- -- name: Allowing non-local IP binding - sysctl: name="net.ipv4.ip_nonlocal_bind" value=1 sysctl_set=yes +- name: Setting sysctl values + sysctl: name={{ item.name }} value={{ item.value }} sysctl_set=yes + with_items: + - { name: "net.ipv4.ip_nonlocal_bind", value: 1} + - { name: "net.unix.max_dgram_qlen", value: 128} when: set_sysctl | bool - name: Ensuring config directories exist diff --git a/docker/haproxy/extend_start.sh b/docker/haproxy/extend_start.sh index 16a65c0af..c1914bb9e 100644 --- a/docker/haproxy/extend_start.sh +++ b/docker/haproxy/extend_start.sh @@ -1,8 +1,5 @@ #!/bin/bash -# Set datagram receiving queue length to 128 for haproxy's socket -sysctl net.unix.max_dgram_qlen=128 - # We are intentionally not using exec so we can reload the haproxy config later echo "Running command: '${CMD}'" $CMD |