diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-17 18:39:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-17 18:39:44 +0000 |
| commit | 8c0da193136c8e4a72f64a9bfaf1bde2b7d4464c (patch) | |
| tree | 90b54f162b26492971465591a1bbc88e8f27c1d0 | |
| parent | d077fa279c69c9a56d2bae138e5b8cfa62991d78 (diff) | |
| parent | 7ddad3f3d572182f1f4d42925e17217e7752e182 (diff) | |
| download | kolla-8c0da193136c8e4a72f64a9bfaf1bde2b7d4464c.tar.gz kolla-8c0da193136c8e4a72f64a9bfaf1bde2b7d4464c.zip | |
Merge "Move haproxy socket to volume"
| -rw-r--r-- | ansible/roles/haproxy/tasks/start.yml | 22 | ||||
| -rw-r--r-- | ansible/roles/haproxy/templates/haproxy.cfg.j2 | 2 | ||||
| -rw-r--r-- | docker/keepalived/check_alive.sh | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/ansible/roles/haproxy/tasks/start.yml b/ansible/roles/haproxy/tasks/start.yml index 5f838cd51..0193350f7 100644 --- a/ansible/roles/haproxy/tasks/start.yml +++ b/ansible/roles/haproxy/tasks/start.yml @@ -1,26 +1,26 @@ --- -- name: Starting keepalived container +- name: Starting haproxy container kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" - image: "{{ keepalived_image_full }}" - name: "keepalived" + image: "{{ haproxy_image_full }}" + name: "haproxy" privileged: True volumes: - - "{{ node_config_directory }}/keepalived/:{{ container_config_directory }}/:ro" - - "/run:/run" - - "/lib/modules:/lib/modules:ro" + - "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro" + - "haproxy_socket:/var/lib/kolla/haproxy/" -- name: Starting haproxy container +- name: Starting keepalived container kolla_docker: action: "start_container" common_options: "{{ docker_common_options }}" - image: "{{ haproxy_image_full }}" - name: "haproxy" + image: "{{ keepalived_image_full }}" + name: "keepalived" privileged: True volumes: - - "{{ node_config_directory }}/haproxy/:{{ container_config_directory }}/:ro" - - "/run:/run" + - "{{ node_config_directory }}/keepalived/:{{ container_config_directory }}/:ro" + - "/lib/modules:/lib/modules:ro" + - "haproxy_socket:/var/lib/kolla/haproxy/" - name: Ensuring latest haproxy config is used command: docker exec haproxy /usr/local/bin/kolla_ensure_haproxy_latest_config diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2 index e8af22ea1..d45682d31 100644 --- a/ansible/roles/haproxy/templates/haproxy.cfg.j2 +++ b/ansible/roles/haproxy/templates/haproxy.cfg.j2 @@ -1,7 +1,7 @@ global daemon maxconn 4000 - stats socket /run/haproxy.sock + stats socket /var/lib/kolla/haproxy/haproxy.sock defaults mode http diff --git a/docker/keepalived/check_alive.sh b/docker/keepalived/check_alive.sh index 8c2684f10..9bb87d7b7 100644 --- a/docker/keepalived/check_alive.sh +++ b/docker/keepalived/check_alive.sh @@ -3,4 +3,4 @@ # This will return 0 when it successfully talks to the haproxy daemon via the socket # Failures return 1 -echo "show info" | socat unix-connect:/run/haproxy.sock stdio +echo "show info" | socat unix-connect:/var/lib/kolla/haproxy/haproxy.sock stdio |