Commit ac3aeb61 authored by Thomas Goirand's avatar Thomas Goirand

Attempt to fix dhcp in DVR mode.

parent e076a2b4
......@@ -103,6 +103,7 @@ class oci::compute(
'password' => $pass_nova_messaging,
}),
rabbit_use_ssl => $use_ssl,
kombu_ssl_ca_certs => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem',
amqp_sasl_mechanisms => 'PLAIN',
use_ipv6 => false,
glance_api_servers => "${base_url}/image",
......@@ -127,7 +128,6 @@ class oci::compute(
'keystone/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
'neutron/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
'neutron/endpoint_override': value => "${base_url}/network";
'oslo_messaging_rabbit/ssl_ca_file': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
}
# Needed, so puppet-openstack can restart virtlogd and libvirtd after configuration
......@@ -218,6 +218,7 @@ class oci::compute(
'password' => $pass_neutron_messaging,
}),
rabbit_use_ssl => $use_ssl,
kombu_ssl_ca_certs => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem',
amqp_sasl_mechanisms => 'PLAIN',
allow_overlapping_ips => true,
core_plugin => 'ml2',
......@@ -229,7 +230,6 @@ class oci::compute(
}
neutron_config {
'nova/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
'oslo_messaging_rabbit/ssl_ca_file': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
}
class { '::neutron::server::notifications':
......@@ -257,10 +257,6 @@ class oci::compute(
agent_mode => 'dvr',
extensions => 'fwaas_v2',
}
class { '::neutron::agents::dhcp':
interface_driver => 'openvswitch',
debug => true,
}
class { '::neutron::agents::metering':
interface_driver => 'openvswitch',
debug => true,
......@@ -275,16 +271,18 @@ class oci::compute(
shared_secret => $pass_metadata_proxy_shared_secret,
metadata_workers => 2,
package_ensure => 'latest',
metadata_protocol => 'http',
metadata_host => "127.0.0.1",
# metadata_insecure => true,
metadata_protocol => 'https',
metadata_host => $vip_ipaddr,
}
class { '::neutron::agents::ml2::ovs':
local_ip => $machine_ip,
tunnel_types => ['vxlan'],
bridge_mappings => ['external:br-ex'],
extensions => 'fwaas_v2',
l2_population => true,
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,
}
package { 'l2gw networking':
name => 'python3-networking-l2gw',
......
......@@ -2169,11 +2169,27 @@ test -e \$mon_data/done
# ]
}
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,
}
neutron_config {
'nova/cafile': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
# 'oslo_messaging_rabbit/ssl_ca_file': value => '/etc/ssl/certs/oci-pki-oci-ca-chain.pem';
}
class { '::neutron::agents::dhcp':
interface_driver => 'openvswitch',
debug => true,
}
class { '::neutron::services::lbaas::octavia':
base_url => "${base_url}/loadbalance",
allocates_vip => true,
......
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