From 9d9b4c1aaaee795e93b07331645ed8589152d03e Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Wed, 27 Jan 2016 18:15:40 +0800 Subject: bugfix: haproxy for odl JIRA: COMPASS-288 Change-Id: Ifd5ce06237570bbc524958854a4859515cc098b0 Signed-off-by: chenshuai@huawei.com --- .../ansible/roles/odl_cluster/tasks/main.yml | 3 - .../roles/odl_cluster/tasks/odl_controller.yml | 15 +++ .../roles/odl_cluster/templates/haproxy-odl.cfg | 24 +++++ .../ansible/roles/odl_cluster/templates/jetty.xml | 106 +++++++++++++++++++++ 4 files changed, 145 insertions(+), 3 deletions(-) create mode 100755 deploy/adapters/ansible/roles/odl_cluster/templates/haproxy-odl.cfg create mode 100755 deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml (limited to 'deploy/adapters/ansible/roles') diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml index 3bb9d9be..5b3818bb 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/main.yml @@ -9,6 +9,3 @@ include: openvswitch.yml when: groups['odl']|length !=0 and inventory_hostname not in groups['odl'] -- name: Wait 5 minutes after odl deployment - shell: sleep 300 - when: groups['odl']|length !=0 diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml index 6d43b9ef..565e12e4 100755 --- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml +++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml @@ -83,6 +83,10 @@ # notify: # - restart odl service +- name: create jetty config + template: + src: jetty.xml + dest: "{{ odl_home }}/etc/jetty.xml" - name: install odl pip packages pip: name={{ item }} state=present @@ -146,6 +150,14 @@ #- name: copy Jolokia-OSGi jar config # copy: src=roles/odl_cluster/templates/jolokia-osgi-1.1.5.jar dest="{{ odl_home }}/system/org/jolokia/jolokia-osgi/1.1.5/" +- name: create odl haproxy config file + template: + src: haproxy-odl.cfg + dest: "/opt/haproxy-odl.cfg" + +- name: add odl haproxy configuration to haproxy.cfg + shell: "cat /opt/haproxy-odl.cfg >> /etc/haproxy/haproxy.cfg" + - name: remove karaf data directory shell: rm -rf {{ odl_home }}/data/*; @@ -228,3 +240,6 @@ - name: restart neutron-metadata-agent server service: name=neutron-metadata-agent state=restarted + +- name: restart haproxy server + service: name=haproxy state=restarted diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/haproxy-odl.cfg b/deploy/adapters/ansible/roles/odl_cluster/templates/haproxy-odl.cfg new file mode 100755 index 00000000..1f3bc9ed --- /dev/null +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/haproxy-odl.cfg @@ -0,0 +1,24 @@ +listen odl-rest-api-1 + bind {{ internal_vip.ip }}:8080 + bind {{ public_vip.ip }}:8080 + mode http + balance source + option httplog + option nolinger + timeout client 3m + timeout server 3m +{% for host,ip in haproxy_hosts.items() %} + server {{ host }} {{ ip }}:8080 weight 1 check inter 2000 rise 2 fall 3 +{% endfor %} + +listen odl-rest-api-2 + bind {{ internal_vip.ip }}:8181 + bind {{ public_vip.ip }}:8181 + mode http + balance source + option httplog + timeout client 3m + timeout server 3m +{% for host,ip in haproxy_hosts.items() %} + server {{ host }} {{ ip }}:8181 weight 1 check inter 2000 rise 2 fall 3 +{% endfor %} diff --git a/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml b/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml new file mode 100755 index 00000000..3ee37509 --- /dev/null +++ b/deploy/adapters/ansible/roles/odl_cluster/templates/jetty.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + 300000 + 2 + false + 8543 + 20000 + 5000 + + + + + + + + + + + + + 300000 + 2 + false + 8443 + 20000 + 5000 + + + + + + + + + + + + + + + karaf + karaf + + + org.apache.karaf.jaas.boot.principal.RolePrincipal + + + + + + + + + + default + karaf + + + org.apache.karaf.jaas.boot.principal.RolePrincipal + + + + + + + + -- cgit 1.2.3-korg