summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2017-08-04 11:44:14 +0800
committerwutianwei <wutianwei1@huawei.com>2017-08-04 11:44:14 +0800
commitfc2298268e6fb4f62423b5100baf479411a6d5d1 (patch)
treebdc2be431fd354dbfb7fcdb370648c25ba884332
parent92473847f4758fa9557c677ae207e9e92de1f13f (diff)
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>
-rw-r--r--deploy/adapters/ansible/roles/post-openstack/tasks/main.yml6
-rwxr-xr-xplugins/moon/roles/moon/handlers/main.yml3
2 files changed, 2 insertions, 7 deletions
diff --git a/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml b/deploy/adapters/ansible/roles/post-openstack/tasks/main.yml
index 2ea325e6..10d8f727 100644
--- 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 809b1ef3..ab2a090b 100755
--- 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