Browse code

Merge "Create initial network when using Cisco N1k plugin"

Jenkins authored on 2015/01/27 01:41:29
Showing 2 changed files
... ...
@@ -534,6 +534,11 @@ function create_neutron_initial_network {
534 534
     TENANT_ID=$(openstack project list | grep " demo " | get_field 1)
535 535
     die_if_not_set $LINENO TENANT_ID "Failure retrieving TENANT_ID for demo"
536 536
 
537
+    # Allow drivers that need to create an initial network to do so here
538
+    if type -p neutron_plugin_create_initial_network_profile > /dev/null; then
539
+        neutron_plugin_create_initial_network_profile $PHYSICAL_NETWORK
540
+    fi
541
+
537 542
     if is_provider_network; then
538 543
         die_if_not_set $LINENO PHYSICAL_NETWORK "You must specify the PHYSICAL_NETWORK"
539 544
         die_if_not_set $LINENO PROVIDER_NETWORK_TYPE "You must specifiy the PROVIDER_NETWORK_TYPE"
... ...
@@ -144,6 +144,10 @@ function neutron_plugin_configure_service {
144 144
     fi
145 145
 }
146 146
 
147
+function neutron_plugin_create_initial_network_profile {
148
+    neutron cisco-network-profile-create default_network_profile vlan --segment_range 1-3000 --physical_network "$1"
149
+}
150
+
147 151
 function neutron_plugin_setup_interface_driver {
148 152
     local conf_file=$1
149 153
     iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver