diff options
| author | SamYaple <sam@yaple.net> | 2016-03-15 13:49:27 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2016-03-15 14:56:38 +0000 |
| commit | 22fe11840ba738c045c3dce1bad840ce28c4b5b4 (patch) | |
| tree | e2a9232d23cae759ef55ce6cf1bfefa53c22baa9 | |
| parent | f4d6aaf0979754b6198f702e309e4a4688b4645b (diff) | |
| download | kolla-22fe11840ba738c045c3dce1bad840ce28c4b5b4.tar.gz kolla-22fe11840ba738c045c3dce1bad840ce28c4b5b4.zip | |
Move sysctl out of haproxy container
sysctl was improperly set in the contaienr itself which is not correct
TrivialFix
Change-Id: If2ffca6d2a40e86db4af2f103a27b280bc5fa2ff
| -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 |