Skip to content
Snippets Groups Projects

Network extdouble

Merged Riccardo Bucchi requested to merge network_extdouble into master
1 file
+ 30
87
Compare changes
  • Side-by-side
  • Inline
@@ -51,8 +51,6 @@ class iaas::profile::neutron::router (
}
class { '::neutron::agents::l3':
#double_external_network
# external_network_bridge => 'br-ex',
external_network_bridge => ' ',
use_namespaces => true,
router_delete_namespaces => true,
@@ -75,8 +73,6 @@ class iaas::profile::neutron::router (
}
class { '::neutron::agents::vpnaas':
#double_external_network
# external_network_bridge => "br-ex",
external_network_bridge => ' ',
}
class { '::neutron::agents::lbaas': }
@@ -114,25 +110,20 @@ class iaas::profile::neutron::router (
local_ip => $local_ip,
enabled => true,
tunnel_types => ['gre'],
#double_external_network, variable modified
#ori bridge_mappings => ['external:br-ex'],
# bridge_mappings => [$bridge_mappings],
bridge_mappings => [$bridge_mappings1,$bridge_mappings2],
require => File['etc_default_neutron-server'],
}
# $_external_device1 = device_for_network($external_network1)
notify { "br-ex1: $::brex1_eval":
loglevel => alert,
}
notify { "br-ex2: $::brex2_eval":
loglevel => alert,
}
#notify { "external device1: $_external_device1 -- external network: $external_network1":
# loglevel => alert,
#}
# notify { "br-ex1: $::brex1_eval":
# loglevel => alert,
# }
# notify { "br-ex2: $::brex2_eval":
# loglevel => alert,
# }
# notify { "external device1: $_external_device1 -- external network: $external_network1":
# loglevel => alert,
# }
# Set public network if public_interface != $external_device1
if $public_gateway {
@@ -160,8 +151,6 @@ notify { "br-ex2: $::brex2_eval":
}
# if $_external_device1 != 'br_ex1' {
# Evaluate br-ex1, if present set it
if $::brex1_eval != 'br-ex1' {
@@ -236,11 +225,9 @@ notify { "br-ex2: $::brex2_eval":
if $external_device2 {
# $_external_device2 = device_for_network($external_network2)
#notify { "external device2: $_external_device2 -- external network: $external_network2":
# loglevel => alert,
#}
# if $_external_device2 != 'br_ex2' {
# notify { "external device2: $_external_device2 -- external network: $external_network2":
# loglevel => alert,
# }
# Evaluate br-ex2, if presetn set it
if $::brex2_eval != 'br-ex2' {
@@ -250,68 +237,24 @@ notify { "br-ex2: $::brex2_eval":
$public_netmask2 = $::facts["netmask_${external_device2}"]
$public_macaddr2 = $::facts["macaddress_${external_device2}"]
# if $public_ipaddress2 {
# network_config { $external_device2:
# ensure => 'present',
# family => 'inet',
# method => 'manual',
# options => {
# 'up' => "ifconfig ${external_device2} 0.0.0.0 promisc up",
# 'down' => "ifconfig ${external_device2} promisc down",
# },
# } ->
# network_config { 'br-ex2':
# ensure => 'present',
# family => 'inet',
# method => 'static',
# ipaddress => $public_ipaddress2,
# netmask => $public_netmask2,
# } ->
# vs_port { $external_device2:
# ensure => present,
# bridge => 'br-ex2',
# require => Class['::neutron::agents::ml2::ovs'],
# } ->
# network_route { 'route_ext2':
# ensure => 'present',
# gateway => $external_gateway2,
# interface => 'br-ex2',
# netmask => '0.0.0.0',
# network => $external_network2,
# require => Package['ifupdown-extra']
# } ->
# exec { "set_br-ex2_hwaddr":
# command => "ovs-vsctl set bridge br-ex2 other-config:hwaddr=$public_macaddr2",
# path => "/usr/local/bin/:/bin/:/usr/bin:/sbin/:/usr/sbin/",
# } ->
# exec { "restart_external2":
# command => "ifconfig $external_device2 0.0.0.0 promisc",
# path => "/usr/local/bin/:/bin/:/sbin/:/usr/sbin/",
# } ->
# exec { "restart_br-ex2":
# command => "ifdown br-ex2 && ifup br-ex2",
# path => "/usr/local/bin/:/bin/:/sbin/:/usr/sbin/",
# }
# } else {
network_config { $external_device2:
ensure => 'present',
family => 'inet',
method => 'manual',
options => {
'up' => "ifconfig ${external_device2} 0.0.0.0 promisc up",
'down' => "ifconfig ${external_device2} promisc down",
},
} ->
vs_port { $external_device2:
ensure => present,
bridge => 'br-ex2',
require => Class['::neutron::agents::ml2::ovs'],
} ->
exec { "set_br-ex2_hwaddr":
command => "ovs-vsctl set bridge br-ex2 other-config:hwaddr=$public_macaddr2",
path => "/usr/local/bin/:/bin/:/usr/bin:/sbin/:/usr/sbin/",
}
# }
network_config { $external_device2:
ensure => 'present',
family => 'inet',
method => 'manual',
options => {
'up' => "ifconfig ${external_device2} 0.0.0.0 promisc up",
'down' => "ifconfig ${external_device2} promisc down",
},
} ->
vs_port { $external_device2:
ensure => present,
bridge => 'br-ex2',
require => Class['::neutron::agents::ml2::ovs'],
} ->
exec { "set_br-ex2_hwaddr":
command => "ovs-vsctl set bridge br-ex2 other-config:hwaddr=$public_macaddr2",
path => "/usr/local/bin/:/bin/:/usr/bin:/sbin/:/usr/sbin/",
}
}
}
Loading