add workround for swift

JIRA: COMPASS-450

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

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/neutron-compute/handlers/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/neutron-compute/handlers/main.yml
new file mode 100644 (file)
index 0000000..ca4e808
--- /dev/null
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/neutron-compute/handlers/main.yml
@@ -0,0 +1,15 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+- name: restart neutron compute service
+  service: name={{ item }} state=restarted enabled=yes
+  with_items: services | union(services_noarch)
+
+- name: restart nova-compute services
+  service: name=nova-compute state=restarted enabled=yes

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml
index b3c93bb..769d3a0 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml
@@ -62,6 +62,7 @@
     - swift-container-updater
     - swift-object-replicator
   when: inventory_hostname in groups['compute']
+  ignore_errors: True
 
 - name: sleep 10 second
   shell: sleep 10
@@ -83,3 +84,4 @@
     - swift-container-updater
     - swift-object-replicator
   when: inventory_hostname in groups['compute']
+  ignore_errors: True

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml
index 8e33716..68e34d0 100644 (file)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml
@@ -67,8 +67,11 @@
 - name: copy swift lib
   copy: src=swift-lib.tar.gz dest=/tmp/swift-lib.tar.gz
 
-- name: untar swift lib
-  shell: >
-    tar zxf /tmp/swift-lib.tar.gz;
-    cp /tmp/swift-lib/* /usr/lib/;
+- name: upload swift lib
+  unarchive: src=swift-lib.tar.gz dest=/usr/lib/
+
+#- name: untar swift lib
+#  shell: >
+#    tar zxf /tmp/swift-lib.tar.gz;
+#    cp /tmp/swift-lib/* /usr/lib/;