From acd8c98d4a314fe467f702e04453b26070ffe6d8 Mon Sep 17 00:00:00 2001
From: "chenshuai@huawei.com" <chenshuai@huawei.com>
Date: Thu, 4 Feb 2016 18:21:00 +0800
Subject: bugfix:disable accelerate mode in ansible for odl

JIRA: COMPASS-306

Change-Id: I9fd730b2a996484138a56513e0e763195fe3ee11
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit f02cdae52268727d9498d1bc4afde76631dd47e8)
---
 .../ansible/openstack/HA-ansible-multinodes.yml    | 52 ++++++++++++----------
 .../ansible/roles/odl_cluster_post/tasks/main.yml  |  4 ++
 2 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100755 deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml

diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
index 5c61c310..cf43b1cc 100644
--- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml
@@ -92,30 +92,6 @@
   roles:
     - secgroup
 
-- hosts: all
-  remote_user: root
-  accelerate: true
-  roles:
-    - odl_cluster
-
-- hosts: all
-  remote_user: root
-  accelerate: true
-  roles:
-    - onos_cluster
-
-- hosts: all
-  remote_user: root
-  sudo: True
-  roles:
-    - open-contrail
-
-- hosts: controller
-  remote_user: root
-  accelerate: true
-  roles:
-    - ext-network
-
 - hosts: ceph_adm
   remote_user: root
   accelerate: true
@@ -198,3 +174,31 @@
 
     - name: chown ssh file
       shell: chown -R nova:nova /var/lib/nova/.ssh;
+
+
+- hosts: all
+  remote_user: root
+  roles:
+    - odl_cluster
+
+- hosts: all
+  remote_user: root
+  accelerate: true
+  roles:
+    - onos_cluster
+
+- hosts: all
+  remote_user: root
+  sudo: True
+  roles:
+    - open-contrail
+
+- hosts: controller
+  remote_user: root
+  roles:
+    - ext-network
+
+- hosts: all
+  remote_user: root
+  roles:
+    - odl_cluster_post
diff --git a/deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml b/deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml
new file mode 100755
index 00000000..83d75c39
--- /dev/null
+++ b/deploy/adapters/ansible/roles/odl_cluster_post/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+- name: restart opendaylight
+  shell: sleep 60; service opendaylight restart; sleep 300;
+  when: inventory_hostname in groups['odl']
-- 
cgit 1.2.3-korg