Advertisement
Guest User

Untitled

a guest
Apr 3rd, 2016
77
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.41 KB | None | 0 0
  1. diff --git a/ansible/roles/haproxy/tasks/start.yml b/ansible/roles/haproxy/tasks/start.yml
  2. index 7ad4d10..bb43bc1 100644
  3. --- a/ansible/roles/haproxy/tasks/start.yml
  4. +++ b/ansible/roles/haproxy/tasks/start.yml
  5. @@ -10,6 +10,7 @@
  6.        - "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro"
  7.        - "haproxy_socket:/var/lib/kolla/haproxy/"
  8.        - "heka_socket:/var/lib/kolla/heka/"
  9. +      - "kolla_logs:/var/log/kolla/"
  10.  
  11.  - name: Starting keepalived container
  12.    kolla_docker:
  13. @@ -23,6 +24,7 @@
  14.        - "/lib/modules:/lib/modules:ro"
  15.        - "haproxy_socket:/var/lib/kolla/haproxy/"
  16.        - "heka_socket:/var/lib/kolla/heka/"
  17. +      - "kolla_logs:/var/log/kolla/"
  18.  
  19.  - name: Ensuring latest haproxy config is used
  20.    command: docker exec haproxy /usr/local/bin/kolla_ensure_haproxy_latest_config
  21. diff --git a/docker/haproxy/extend_start.sh b/docker/haproxy/extend_start.sh
  22. index e2d13f4..3683f8c 100644
  23. --- a/docker/haproxy/extend_start.sh
  24. +++ b/docker/haproxy/extend_start.sh
  25. @@ -1,5 +1,14 @@
  26.  #!/bin/bash
  27.  
  28. +# Create log directory, with appropriate permissions
  29. +if [[ ! -d "/var/log/kolla/haproxy" ]]; then
  30. +    mkdir -p /var/log/kolla/haproxy
  31. +fi
  32. +if [[ $(stat -c %a /var/log/kolla/haproxy) != "755" ]]; then
  33. +    chmod 755 /var/log/kolla/haproxy
  34. +fi
  35. +
  36. +
  37.  # We are intentionally not using exec so we can reload the haproxy config later
  38.  echo "Running command: '${CMD}'"
  39.  $CMD
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement