x
/
fuel-plugin-cisco-aci
Code Issues Proposed changes

UC8 minor fixes. 

Change-Id: Ifcd15fa1a2e38d2df55865e58bcca64f1df4852a
This commit is contained in:
sergeylevchenko 2015-06-30 16:10:33 +03:00
parent 7b890aeeab
commit 6d859c0620
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/cisco_aci/manifests/gbp_and_apic_gbp.pp
View File

@ -97,7 +97,7 @@ class cisco_aci::gbp_and_apic_gbp (
static_config => $static_config,
additional_config => $additional_config,
ext_net_enable => $ext_net_enable,
ext_net_name => $apic_external_network,
ext_net_name => $apic_net_name,
ext_net_switch => $ext_net_switch,
ext_net_port => $ext_net_port,
ext_net_subnet => $ext_net_subnet,

6
deployment_scripts/puppet/modules/neutron/lib/puppet/provider/neutron.rb
View File

@ -249,9 +249,9 @@ correctly configured.")
# fields=line.split(/\s*\|\s*/)
fields = auth_keystone('tenant-list').split(/\s*\|\s*/)
fields.each do |line|
if fields[1] and fields[1].size == 32
if fields[2] == name
rv = fields[1]
if fields[5] and fields[5].size == 32
if fields[6] == name
rv = fields[5]
break
end
end

12
deployment_scripts/puppet/modules/neutron/manifests/config_apic.pp
View File

@ -39,8 +39,10 @@ class neutron::config_apic (
}
}
if ($ext_net_config == false) {
if ($ext_net_enable == false) {
$apic_ext_net = $apic_external_network
}else {
$apic_ext_net = $ext_net_name
}
if ($pre_existing_vpc == true) {
@ -75,10 +77,10 @@ class neutron::config_apic (
if ($ext_net_enable == true){
neutron_plugin_ml2_cisco {
"apic_external_network:${ext_net_name}/switch": value => $ext_net_switch;
"apic_external_network:${ext_net_name}/port": value => $ext_net_port;
"apic_external_network:${ext_net_name}/cidr_exposed": value => $ext_net_subnet;
"apic_external_network:${ext_net_name}/gateway_ip": value => $ext_net_gateway;
"apic_external_network:${apic_ext_net}/switch": value => $ext_net_switch;
"apic_external_network:${apic_ext_net}/port": value => $ext_net_port;
"apic_external_network:${apic_ext_net}/cidr_exposed": value => $ext_net_subnet;
"apic_external_network:${apic_ext_net}/gateway_ip": value => $ext_net_gateway;
}
}

2
metadata.yaml
View File

@ -3,7 +3,7 @@ name: cisco_aci
# Human-readable name for your plugin
title: Cisco APIC Plugin
# Plugin version
version: 1.0.25
version: 1.0.27
# Description
description: Enable to use Cisco SDN solutions for Neutron
# Required fuel version