From 31d9c7aae2ed62498636ba718d6af3e33b998071 Mon Sep 17 00:00:00 2001
From: Igor Gajsin <igajsin@mirantis.com>
Date: Mon, 10 Aug 2015 15:55:14 +0300
Subject: [PATCH] add neutron-server restart

Add restart of neutron-server after the driver installation and the
plugin installation. Also _delete_net became more robust.

Change-Id: I0140388d90d0c81f58df0738ff6edccbf9810d94
---
 deployment_scripts/install_the_driver.sh | 17 ++++++++++++-----
 tasks.yaml                               |  8 +++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/deployment_scripts/install_the_driver.sh b/deployment_scripts/install_the_driver.sh
index 5ddf973..070da1e 100755
--- a/deployment_scripts/install_the_driver.sh
+++ b/deployment_scripts/install_the_driver.sh
@@ -45,11 +45,17 @@ function _del_network {
     . /root/openrc
     router=router04
     neutron router-gateway-clear $router
-    port=$(neutron router-port-list $router| grep  ip_a| cut -f 2 -d\ )
-    neutron router-interface-delete $router port=$port
-    neutron port-delete $port
-    neutron net-delete net04
-    neutron net-delete net04_ext
+    for port in $(neutron router-port-list $router| grep  ip_a| cut -f 2 -d\ ); do
+        neutron router-interface-delete $router port=$port
+        neutron port-delete $port
+    done
+    for net in $(neutron net-list|grep '/'|cut -f 4 -d\ ); do
+        neutron net-delete $net
+    done
+}
+
+function _neutron_restart {
+    service neutron-server restart
 }
 
 _del_network
@@ -58,3 +64,4 @@ _core_install
 _dirty_hack
 _driver_install
 _ln
+_neutron_restart
diff --git a/tasks.yaml b/tasks.yaml
index 3fb1174..287a941 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -10,4 +10,10 @@
   parameters:
     puppet_manifest: puppet/manifests/site.pp
     puppet_modules:  puppet/modules:/etc/puppet/modules
-    timeout: 720
\ No newline at end of file
+    timeout: 720
+- role: ['primary-controller','controller']
+  stage: post_deployment/7002
+  type: shell
+  parameters:
+    cmd: service neutron-server restart
+    timeout: 60
\ No newline at end of file