aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchenshuai@huawei.com <chenshuai@huawei.com>2016-07-31 12:41:55 -0400
committerchenshuai@huawei.com <chenshuai@huawei.com>2016-07-31 13:54:14 -0400
commit922471630508ca190e7fd0530c7e67c8f49a6530 (patch)
tree1c2c14b83c598453b5b0454196bdf2893caa24ab
parent86f1270e1a5038d02bd10cadeaa64a3802f6394a (diff)
add workround for swift
JIRA: COMPASS-450 Change-Id: I29603422e47d9dc99936ac3fd971832206b3615a Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/neutron-compute/handlers/main.yml15
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/main.yml2
-rw-r--r--deploy/adapters/ansible/openstack_mitaka_xenial/roles/swift/tasks/swift-compute1.yml11
3 files changed, 24 insertions, 4 deletions
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
index 00000000..ca4e8088
--- /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 b3c93bb6..769d3a05 100644
--- 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 8e337163..68e34d0e 100644
--- 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/;