Fix ODL failure

JIRA: COMPASS-604

1. add delay in ovs restart
2. modify physnet mapping

Change-Id: I5a7cef2fb03f355c00a1ea442694715643ae4ab8
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
index bc2f53d..91ca514 100755 (executable)
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
@@ -39,6 +39,8 @@
 - name: Stop the Open vSwitch service and clear existing OVSDB
   shell: >
     service {{ service_ovs_name }} stop ;
+    sleep 3;
     rm -rf /var/log/openvswitch/* ;
     rm -rf /etc/openvswitch/conf.db ;
+    sleep 3;
     service {{ service_ovs_name }} start ;

diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/odl-pre.yml b/plugins/odl_cluster/roles/setup-odl/tasks/odl-pre.yml
index 6463166..21f0e86 100755 (executable)
--- a/plugins/odl_cluster/roles/setup-odl/tasks/odl-pre.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/odl-pre.yml
@@ -35,9 +35,8 @@
       {% set _ = compu_l2_list.append(l2_mapping) %}
       {% set _ = compu_l3_list.append(l3_mapping) %}
       {% endfor %}
-      {% set pub_l3_mapping = pub_l3_mapping[0].replace(pub_intf[0], compu_pub_intf) %}
       {% set _ = compu_l2_list.append(pub_l2_mapping[0]) %}
-      {% set _ = compu_l3_list.append(pub_l3_mapping) %}
+      {% set _ = compu_l3_list.append(pub_l3_mapping[0]) %}
       public_bridge: "{{ pub_bridge[0] }}"
       contr_public_intf: "{{ pub_intf[0] }}"
       contr_l2_mappings: "{{ ','.join(contr_l2_list) }}"