bugfix: haproxy for odl

JIRA: COMPASS-288

Change-Id: Ifd5ce06237570bbc524958854a4859515cc098b0
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>

2 files changed, 15 insertions, 3 deletions

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