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
This commit is contained in:
Igor Gajsin 2015-08-10 15:55:14 +03:00
parent f987148646
commit 31d9c7aae2
2 changed files with 19 additions and 6 deletions

View File

@ -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

View File

@ -10,4 +10,10 @@
parameters:
puppet_manifest: puppet/manifests/site.pp
puppet_modules: puppet/modules:/etc/puppet/modules
timeout: 720
timeout: 720
- role: ['primary-controller','controller']
stage: post_deployment/7002
type: shell
parameters:
cmd: service neutron-server restart
timeout: 60