diff --git a/lib/neutron b/lib/neutron index 954a2d9524..b22c00b097 100755 --- a/lib/neutron +++ b/lib/neutron @@ -534,6 +534,11 @@ function create_neutron_initial_network { TENANT_ID=$(openstack project list | grep " demo " | get_field 1) die_if_not_set $LINENO TENANT_ID "Failure retrieving TENANT_ID for demo" + # Allow drivers that need to create an initial network to do so here + if type -p neutron_plugin_create_initial_network_profile > /dev/null; then + neutron_plugin_create_initial_network_profile $PHYSICAL_NETWORK + fi + if is_provider_network; then die_if_not_set $LINENO PHYSICAL_NETWORK "You must specify the PHYSICAL_NETWORK" die_if_not_set $LINENO PROVIDER_NETWORK_TYPE "You must specifiy the PROVIDER_NETWORK_TYPE" diff --git a/lib/neutron_plugins/cisco b/lib/neutron_plugins/cisco index b067aa6b11..90dcd574c0 100644 --- a/lib/neutron_plugins/cisco +++ b/lib/neutron_plugins/cisco @@ -144,6 +144,10 @@ function neutron_plugin_configure_service { fi } +function neutron_plugin_create_initial_network_profile { + neutron cisco-network-profile-create default_network_profile vlan --segment_range 1-3000 --physical_network "$1" +} + function neutron_plugin_setup_interface_driver { local conf_file=$1 iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver