Commit 45e68184 authored by Thomas Goirand's avatar Thomas Goirand

Working networking.

parent cb4b4829
......@@ -246,19 +246,35 @@ class oci::compute(
www_authenticate_uri => $keystone_auth_uri,
cafile => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem',
}
class { '::neutron::plugins::ml2':
type_drivers => ['vxlan', 'vlan', 'flat'],
tenant_network_types => ['vxlan', 'vlan', 'flat'],
extension_drivers => 'port_security,qos',
mechanism_drivers => 'openvswitch',
firewall_driver => 'iptables_v2',
class { '::neutron::agents::ml2::ovs':
local_ip => $machine_ip,
tunnel_types => ['vxlan'],
bridge_uplinks => ['eth0'],
bridge_mappings => ['external:br-ex'],
# extensions => 'fwaas_v2',
extensions => '',
l2_population => true,
arp_responder => false,
drop_flows_on_start => false,
enable_distributed_routing => true,
manage_vswitch => false,
}
class { '::neutron::agents::l3':
interface_driver => 'openvswitch',
debug => true,
agent_mode => 'dvr',
ha_enabled => true,
extensions => 'fwaas_v2',
ha_enabled => false,
# extensions => 'fwaas_v2',
extensions => '',
}
class { '::neutron::plugins::ml2':
type_drivers => ['flat', 'vlan',],
tenant_network_types => ['vxlan', ],
extension_drivers => 'port_security,qos',
mechanism_drivers => 'openvswitch,l2population',
firewall_driver => 'iptables_v2',
flat_networks => 'external',
vni_ranges => '1000:1999',
}
class { '::neutron::agents::dhcp':
interface_driver => 'openvswitch',
......@@ -283,17 +299,6 @@ class oci::compute(
metadata_protocol => 'http',
metadata_host => $vip_ipaddr,
}
class { '::neutron::agents::ml2::ovs':
local_ip => $machine_ip,
tunnel_types => ['vxlan'],
bridge_uplinks => ['eth0'],
bridge_mappings => ['external:br-ex'],
extensions => 'fwaas_v2',
l2_population => true,
arp_responder => true,
enable_distributed_routing => true,
manage_vswitch => false,
}
package { 'l2gw networking':
name => 'python3-networking-l2gw',
ensure => installed,
......
......@@ -1440,6 +1440,7 @@ export OS_CACERT=/etc/ssl/certs/oci-pki-oci-ca-chain.pem
rabbit_use_ssl => $use_ssl,
kombu_ssl_ca_certs => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem',
rabbit_ha_queues => true,
cache_backend => 'dogpile.cache.memcached',
memcache_servers => $memcached_servers,
}
include ::apache
......@@ -2171,29 +2172,43 @@ test -e \$mon_data/done
# ]
}
neutron_config {
'nova/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
}
class { '::neutron::agents::ml2::ovs':
local_ip => $machine_ip,
tunnel_types => ['vxlan'],
bridge_uplinks => ['eth0'],
bridge_mappings => ['external:br-ex'],
extensions => 'fwaas_v2',
# extensions => 'fwaas_v2',
extensions => '',
l2_population => true,
arp_responder => true,
arp_responder => false,
drop_flows_on_start => false,
enable_distributed_routing => true,
manage_vswitch => false,
}
neutron_config {
'nova/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
}
class { '::neutron::agents::l3':
interface_driver => 'openvswitch',
debug => true,
agent_mode => 'dvr_snat',
ha_enabled => true,
extensions => 'fwaas_v2',
ha_enabled => false,
# extensions => 'fwaas_v2',
extensions => '',
}
class { '::neutron::plugins::ml2':
type_drivers => ['flat', 'vxlan', ],
tenant_network_types => ['vxlan', ],
extension_drivers => 'port_security,qos',
mechanism_drivers => 'openvswitch,l2population',
firewall_driver => 'iptables_v2',
flat_networks => 'external',
vni_ranges => '1000:1999',
}
class { '::neutron::services::lbaas::octavia':
base_url => "${base_url}/loadbalance",
allocates_vip => true,
......@@ -2202,14 +2217,6 @@ test -e \$mon_data/done
admin_tenant_name => 'services',
admin_password => $pass_octavia_authtoken,
}
class { '::neutron::plugins::ml2':
type_drivers => ['vxlan', 'vlan', 'flat'],
tenant_network_types => ['vxlan', 'vlan', 'flat'],
extension_drivers => 'port_security,qos',
mechanism_drivers => 'openvswitch',
firewall_driver => 'iptables_v2',
}
class { '::neutron::server::notifications':
auth_url => $keystone_admin_uri,
password => $pass_nova_authtoken,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment