fix recipe order for allinone role and bootstrap.sh

Change-Id: I75088a00dc17b8a4907a1314d82aff500c5dccfe

bootstrap.sh

@@ -2,11 +2,8 @@
 ## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
 ## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies.
 
-curl https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh \
+wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh
-  --retry 3 \
+/bin/bash -x common-bootstrap.sh 
-  --silent \
-  --show-error \
-  | /bin/bash -x
 
 # To enable cookbook Depends-On support, the Common bootstrap above will already
 # get the cookbook dependencies cloned into ../openstack-cookbook-xxxx.  In order to

roles/allinone.json

@@ -25,10 +25,11 @@
     "recipe[openstack-network::identity_registration]",
     "recipe[openstack-network::ml2_core_plugin]",
     "recipe[openstack-network::ml2_openvswitch]",
-    "recipe[openstack-network::server]",
+    "recipe[openstack-network]",
     "recipe[openstack-network::openvswitch]",
     "recipe[openstack-network::_bridge_config_example]",
     "recipe[openstack-network::plugin_config]",
+    "recipe[openstack-network::server]",
     "recipe[openstack-network::l3_agent]",
     "recipe[openstack-network::dhcp_agent]",
     "recipe[openstack-network::metadata_agent]",