fix bugs for functest and moon baremetal

1. functest change the judgement condition, the DOMAIN_NAME need use Default instead of default
2. making the eth0 down and up to change the route in baremetal deploy

Change-Id: I7dacf59cdd0c4db396b2db8b0a5fdd7003829391
Signed-off-by: wutianwei <wutianwei1@huawei.com>

diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
index 2ea325e..10d8f72 100644 (file)
--- a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
@@ -39,9 +39,3 @@
     dest: /opt/openrc
     regexp: "internalURL"
     replace: "publicURL"
-
-- name: replace Default with default in openrc
-  replace:
-    dest: /opt/openrc
-    regexp: "Default"
-    replace: "default"

diff --git a/plugins/moon/roles/moon/handlers/main.yml b/plugins/moon/roles/moon/handlers/main.yml
index 809b1ef..ab2a090 100755 (executable)
--- a/plugins/moon/roles/moon/handlers/main.yml
+++ b/plugins/moon/roles/moon/handlers/main.yml
@@ -7,7 +7,8 @@
 ##############################################################################
 ---
 - name: restart network service
-  shell: "/sbin/ifdown -a && \
+  shell: "ifconfig eth0 down && ifconfig eth0 up && \
+          /sbin/ifdown -a && \
           /sbin/ifup --ignore-errors -a"
 
 - name: restart nfs service