openstack/devstack
Code Issues Proposed changes

Merge "Create initial network when using Cisco N1k plugin"

Browse Source
This commit is contained in:
Jenkins 2015-01-26 16:41:29 +00:00 committed by Gerrit Code Review
commit 4764cffd5a
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron
View File

@ -534,6 +534,11 @@ function create_neutron_initial_network {
TENANT_ID=$(openstack project list | grep " demo " | get_field 1) TENANT_ID=$(openstack project list | grep " demo " | get_field 1)
die_if_not_set $LINENO TENANT_ID "Failure retrieving TENANT_ID for demo" 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 if is_provider_network; then
die_if_not_set $LINENO PHYSICAL_NETWORK "You must specify the PHYSICAL_NETWORK" 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" die_if_not_set $LINENO PROVIDER_NETWORK_TYPE "You must specifiy the PROVIDER_NETWORK_TYPE"

4
lib/neutron_plugins/cisco
View File

@ -144,6 +144,10 @@ function neutron_plugin_configure_service {
fi 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 { function neutron_plugin_setup_interface_driver {
local conf_file=$1 local conf_file=$1
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver