Convert all class usage to relative names
Change-Id: I229428feb1cb4fc7b551d2654328a8f0bb349910
This commit is contained in:
parent
c6b3800f7d
commit
94673ed159
|
@ -50,7 +50,7 @@ To utilize the neutron module's functionality you will need to declare multiple
|
||||||
|
|
||||||
```puppet
|
```puppet
|
||||||
# enable the neutron service
|
# enable the neutron service
|
||||||
class { '::neutron':
|
class { 'neutron':
|
||||||
enabled => true,
|
enabled => true,
|
||||||
bind_host => '127.0.0.1',
|
bind_host => '127.0.0.1',
|
||||||
default_transport_url => 'rabbit://neutron:passw0rd@localhost:5672/neutron',
|
default_transport_url => 'rabbit://neutron:passw0rd@localhost:5672/neutron',
|
||||||
|
@ -64,7 +64,7 @@ class { 'neutron::server':
|
||||||
}
|
}
|
||||||
|
|
||||||
# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
|
# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
|
||||||
class { '::neutron::plugins::ml2':
|
class { 'neutron::plugins::ml2':
|
||||||
type_drivers => ['vxlan'],
|
type_drivers => ['vxlan'],
|
||||||
tenant_network_types => ['vxlan'],
|
tenant_network_types => ['vxlan'],
|
||||||
vxlan_group => '239.1.1.1',
|
vxlan_group => '239.1.1.1',
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
class { '::neutron':
|
class { 'neutron':
|
||||||
enabled => true,
|
enabled => true,
|
||||||
bind_host => '127.0.0.1',
|
bind_host => '127.0.0.1',
|
||||||
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
||||||
debug => true,
|
debug => true,
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::neutron::server':
|
class { 'neutron::server':
|
||||||
www_authenticate_uri => 'http://127.0.0.1:5000',
|
www_authenticate_uri => 'http://127.0.0.1:5000',
|
||||||
auth_password => 'keystone_secret',
|
auth_password => 'keystone_secret',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::neutron::plugins::ml2':
|
class { 'neutron::plugins::ml2':
|
||||||
type_drivers => ['vlan', 'nexus_vxlan'],
|
type_drivers => ['vlan', 'nexus_vxlan'],
|
||||||
tenant_network_types => ['nexus_vxlan'],
|
tenant_network_types => ['nexus_vxlan'],
|
||||||
network_vlan_ranges => ['physnet:2000:2020'],
|
network_vlan_ranges => ['physnet:2000:2020'],
|
||||||
|
|
|
@ -2,39 +2,39 @@
|
||||||
|
|
||||||
# General Neutron stuff
|
# General Neutron stuff
|
||||||
# Configures everything in neutron.conf
|
# Configures everything in neutron.conf
|
||||||
class { '::neutron':
|
class { 'neutron':
|
||||||
allow_overlapping_ips => true,
|
allow_overlapping_ips => true,
|
||||||
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
||||||
service_plugins => ['metering']
|
service_plugins => ['metering']
|
||||||
}
|
}
|
||||||
|
|
||||||
# The API server talks to keystone for authorisation
|
# The API server talks to keystone for authorisation
|
||||||
class { '::neutron::server':
|
class { 'neutron::server':
|
||||||
auth_password => 'password',
|
auth_password => 'password',
|
||||||
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
||||||
}
|
}
|
||||||
|
|
||||||
# Configure nova notifications system
|
# Configure nova notifications system
|
||||||
class { '::neutron::server::notifications':
|
class { 'neutron::server::notifications':
|
||||||
tenant_name => 'admin',
|
tenant_name => 'admin',
|
||||||
password => 'secrete',
|
password => 'secrete',
|
||||||
}
|
}
|
||||||
|
|
||||||
# Various agents
|
# Various agents
|
||||||
class { '::neutron::agents::dhcp': }
|
class { 'neutron::agents::dhcp': }
|
||||||
class { '::neutron::agents::l3': }
|
class { 'neutron::agents::l3': }
|
||||||
class { '::neutron::agents::vpnaas': }
|
class { 'neutron::agents::vpnaas': }
|
||||||
class { '::neutron::agents::metering': }
|
class { 'neutron::agents::metering': }
|
||||||
|
|
||||||
# This plugin configures Neutron for OVS on the server
|
# This plugin configures Neutron for OVS on the server
|
||||||
# Agent
|
# Agent
|
||||||
class { '::neutron::agents::ml2::ovs':
|
class { 'neutron::agents::ml2::ovs':
|
||||||
local_ip => '192.168.1.1',
|
local_ip => '192.168.1.1',
|
||||||
tunnel_types => ['vxlan']
|
tunnel_types => ['vxlan']
|
||||||
}
|
}
|
||||||
|
|
||||||
# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
|
# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
|
||||||
class { '::neutron::plugins::ml2':
|
class { 'neutron::plugins::ml2':
|
||||||
type_drivers => ['vxlan'],
|
type_drivers => ['vxlan'],
|
||||||
tenant_network_types => ['vxlan'],
|
tenant_network_types => ['vxlan'],
|
||||||
vxlan_group => '239.1.1.1',
|
vxlan_group => '239.1.1.1',
|
||||||
|
@ -45,14 +45,14 @@ class { '::neutron::plugins::ml2':
|
||||||
### Compute Nodes:
|
### Compute Nodes:
|
||||||
# Generally, any machine with a neutron element running on it talks
|
# Generally, any machine with a neutron element running on it talks
|
||||||
# over Rabbit and needs to know if overlapping IPs (namespaces) are in use
|
# over Rabbit and needs to know if overlapping IPs (namespaces) are in use
|
||||||
class { '::neutron':
|
class { 'neutron':
|
||||||
allow_overlapping_ips => true,
|
allow_overlapping_ips => true,
|
||||||
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
||||||
}
|
}
|
||||||
|
|
||||||
# The agent/plugin combo also needs installed on clients
|
# The agent/plugin combo also needs installed on clients
|
||||||
# Agent
|
# Agent
|
||||||
class { '::neutron::agents::ml2::ovs':
|
class { 'neutron::agents::ml2::ovs':
|
||||||
local_ip => '192.168.1.11',
|
local_ip => '192.168.1.11',
|
||||||
tunnel_types => ['vxlan']
|
tunnel_types => ['vxlan']
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,19 +6,19 @@
|
||||||
# This manifest extends the one shown in base_provision.pp
|
# This manifest extends the one shown in base_provision.pp
|
||||||
#
|
#
|
||||||
|
|
||||||
class { '::neutron':
|
class { 'neutron':
|
||||||
allow_overlapping_ips => true,
|
allow_overlapping_ips => true,
|
||||||
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
||||||
service_plugins => ['router']
|
service_plugins => ['router']
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::neutron::server':
|
class { 'neutron::server':
|
||||||
auth_password => 'password',
|
auth_password => 'password',
|
||||||
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
||||||
}
|
}
|
||||||
|
|
||||||
# configure l3-agent to use the new router by name
|
# configure l3-agent to use the new router by name
|
||||||
class { '::neutron::agents::l3':
|
class { 'neutron::agents::l3':
|
||||||
enabled => true,
|
enabled => true,
|
||||||
use_namespaces => false,
|
use_namespaces => false,
|
||||||
require => Neutron_router['demo_router'],
|
require => Neutron_router['demo_router'],
|
||||||
|
|
|
@ -22,24 +22,24 @@
|
||||||
#
|
#
|
||||||
# sudo pcs constraint colocation add neutron_server_service with neutron_vip
|
# sudo pcs constraint colocation add neutron_server_service with neutron_vip
|
||||||
|
|
||||||
class { '::neutron':
|
class { 'neutron':
|
||||||
allow_overlapping_ips => true,
|
allow_overlapping_ips => true,
|
||||||
service_plugins => [ 'dhcp', 'l3' ]
|
service_plugins => [ 'dhcp', 'l3' ]
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::neutron::server':
|
class { 'neutron::server':
|
||||||
enabled => false,
|
enabled => false,
|
||||||
manage_service => false,
|
manage_service => false,
|
||||||
keystone_password => 'password',
|
keystone_password => 'password',
|
||||||
connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::neutron::agents::dhcp':
|
class { 'neutron::agents::dhcp':
|
||||||
enabled => false,
|
enabled => false,
|
||||||
manage_service => false,
|
manage_service => false,
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::neutron::agents::l3':
|
class { 'neutron::agents::l3':
|
||||||
enabled => false,
|
enabled => false,
|
||||||
manage_service => false,
|
manage_service => false,
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
# Example of manifest to deploy Neutron API in WSGI with Apache
|
# Example of manifest to deploy Neutron API in WSGI with Apache
|
||||||
class { '::neutron':
|
class { 'neutron':
|
||||||
allow_overlapping_ips => true,
|
allow_overlapping_ips => true,
|
||||||
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::neutron::server':
|
class { 'neutron::server':
|
||||||
auth_password => 'password',
|
auth_password => 'password',
|
||||||
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
|
||||||
service_name => 'httpd',
|
service_name => 'httpd',
|
||||||
}
|
}
|
||||||
include ::apache
|
include apache
|
||||||
class { '::neutron::wsgi::apache':
|
class { 'neutron::wsgi::apache':
|
||||||
ssl => false,
|
ssl => false,
|
||||||
}
|
}
|
||||||
|
|
|
@ -236,7 +236,7 @@ class Puppet::Provider::Neutron < Puppet::Provider::Openstack
|
||||||
instance = Puppet::Type.type(instance_type).instances.find do |i|
|
instance = Puppet::Type.type(instance_type).instances.find do |i|
|
||||||
# We need to check against the Default domain name because of
|
# We need to check against the Default domain name because of
|
||||||
# https://review.opendev.org/#/c/226919/ which changed the naming
|
# https://review.opendev.org/#/c/226919/ which changed the naming
|
||||||
# format for the tenant to include ::<Domain name>. This should be
|
# format for the tenant to include <Domain name>. This should be
|
||||||
# removed when we drop the resource without a domain name.
|
# removed when we drop the resource without a domain name.
|
||||||
# TODO(aschultz): remove ::domain lookup as part of M-cycle
|
# TODO(aschultz): remove ::domain lookup as part of M-cycle
|
||||||
i.provider.name == name || i.provider.name == "#{name}::#{domain}"
|
i.provider.name == name || i.provider.name == "#{name}::#{domain}"
|
||||||
|
|
|
@ -90,8 +90,8 @@ class neutron::agents::bagpipe (
|
||||||
$local_address = $::ipaddress,
|
$local_address = $::ipaddress,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_bgpvpn_bagpipe_config':
|
resources { 'neutron_bgpvpn_bagpipe_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -54,8 +54,8 @@ class neutron::agents::bgp_dragent(
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_bgp_dragent_config':
|
resources { 'neutron_bgp_dragent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -23,8 +23,8 @@ class neutron::agents::bigswitch (
|
||||||
$agent_enabled = false,
|
$agent_enabled = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if($::osfamily != 'Redhat') {
|
if($::osfamily != 'Redhat') {
|
||||||
fail("Unsupported osfamily ${::osfamily}")
|
fail("Unsupported osfamily ${::osfamily}")
|
||||||
|
|
|
@ -125,8 +125,8 @@ class neutron::agents::dhcp (
|
||||||
$ovsdb_agent_ssl_ca_file = $::os_service_default,
|
$ovsdb_agent_ssl_ca_file = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if (! ($enable_isolated_metadata or $enable_force_metadata)) and $enable_metadata_network {
|
if (! ($enable_isolated_metadata or $enable_force_metadata)) and $enable_metadata_network {
|
||||||
fail('enable_metadata_network to true requires enable_isolated_metadata or enable_force_metadata also enabled.')
|
fail('enable_metadata_network to true requires enable_isolated_metadata or enable_force_metadata also enabled.')
|
||||||
|
|
|
@ -86,8 +86,8 @@ class neutron::agents::l2gw (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_l2gw_agent_config':
|
resources { 'neutron_l2gw_agent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -118,8 +118,8 @@ class neutron::agents::l3 (
|
||||||
$radvd_user = $::os_service_default,
|
$radvd_user = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_l3_agent_config':
|
resources { 'neutron_l3_agent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -89,8 +89,8 @@ class neutron::agents::metadata (
|
||||||
$metadata_ip = undef,
|
$metadata_ip = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_metadata_agent_config':
|
resources { 'neutron_metadata_agent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -66,8 +66,8 @@ class neutron::agents::metering (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_metering_agent_config':
|
resources { 'neutron_metering_agent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -88,8 +88,8 @@ class neutron::agents::ml2::linuxbridge (
|
||||||
validate_legacy(Array, 'validate_array', $physical_interface_mappings)
|
validate_legacy(Array, 'validate_array', $physical_interface_mappings)
|
||||||
validate_legacy(Array, 'validate_array', $bridge_mappings)
|
validate_legacy(Array, 'validate_array', $bridge_mappings)
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_agent_linuxbridge':
|
resources { 'neutron_agent_linuxbridge':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -74,8 +74,8 @@ class neutron::agents::ml2::mlnx (
|
||||||
$enable_multi_interface_driver_cache_maintenance = false,
|
$enable_multi_interface_driver_cache_maintenance = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
$mlnx_agent_package = $::neutron::params::mlnx_agent_package
|
$mlnx_agent_package = $::neutron::params::mlnx_agent_package
|
||||||
$mlnx_agent_service = $::neutron::params::mlnx_agent_service
|
$mlnx_agent_service = $::neutron::params::mlnx_agent_service
|
||||||
|
|
|
@ -123,8 +123,8 @@ class neutron::agents::ml2::networking_baremetal (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if($::osfamily != 'RedHat') {
|
if($::osfamily != 'RedHat') {
|
||||||
# Drivers are only packaged for RedHat at this time
|
# Drivers are only packaged for RedHat at this time
|
||||||
|
|
|
@ -194,8 +194,8 @@ class neutron::agents::ml2::ovs (
|
||||||
$of_interface = undef,
|
$of_interface = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if $enable_dpdk and ! $manage_vswitch {
|
if $enable_dpdk and ! $manage_vswitch {
|
||||||
fail('Enabling DPDK without manage vswitch does not have any effect')
|
fail('Enabling DPDK without manage vswitch does not have any effect')
|
||||||
|
|
|
@ -81,8 +81,8 @@ class neutron::agents::ml2::sriov (
|
||||||
$number_of_vfs = $::os_service_default,
|
$number_of_vfs = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_sriov_agent_config':
|
resources { 'neutron_sriov_agent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -53,8 +53,8 @@ class neutron::agents::ml2::vpp (
|
||||||
$etcd_pass = $::os_service_default,
|
$etcd_pass = $::os_service_default,
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'neutron_agent_vpp':
|
resources { 'neutron_agent_vpp':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -121,8 +121,8 @@ class neutron::agents::n1kv_vem (
|
||||||
$fastpath_flood = 'enable'
|
$fastpath_flood = 'enable'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
require ::vswitch::ovs
|
require ::vswitch::ovs
|
||||||
|
|
||||||
Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] }
|
Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] }
|
||||||
|
|
|
@ -140,8 +140,8 @@ class neutron::agents::ovn_metadata (
|
||||||
$ovn_remote_probe_interval = $::os_service_default,
|
$ovn_remote_probe_interval = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
resources { 'ovn_metadata_agent_config':
|
resources { 'ovn_metadata_agent_config':
|
||||||
purge => $purge_config,
|
purge => $purge_config,
|
||||||
|
|
|
@ -46,8 +46,8 @@ class neutron::agents::vpnaas (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
case $vpn_device_driver {
|
case $vpn_device_driver {
|
||||||
/\.OpenSwan/: {
|
/\.OpenSwan/: {
|
||||||
|
|
|
@ -12,8 +12,8 @@ class neutron::client (
|
||||||
$package_ensure = present
|
$package_ensure = present
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
package { 'python-neutronclient':
|
package { 'python-neutronclient':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
|
|
@ -127,7 +127,7 @@ class neutron::config (
|
||||||
$plugin_nvp_config = {},
|
$plugin_nvp_config = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $server_config)
|
validate_legacy(Hash, 'validate_hash', $server_config)
|
||||||
validate_legacy(Hash, 'validate_hash', $api_config)
|
validate_legacy(Hash, 'validate_hash', $api_config)
|
||||||
|
|
|
@ -62,7 +62,7 @@ class neutron::db (
|
||||||
$database_idle_timeout = undef,
|
$database_idle_timeout = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
if $database_idle_timeout {
|
if $database_idle_timeout {
|
||||||
warning('The database_idle_timeout parameter is deprecated. Please use \
|
warning('The database_idle_timeout parameter is deprecated. Please use \
|
||||||
|
|
|
@ -40,7 +40,7 @@ class neutron::db::mysql (
|
||||||
$collate = 'utf8_general_ci',
|
$collate = 'utf8_general_ci',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
validate_legacy(String, 'validate_string', $password)
|
validate_legacy(String, 'validate_string', $password)
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ class neutron::db::postgresql(
|
||||||
$privileges = 'ALL',
|
$privileges = 'ALL',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
::openstacklib::db::postgresql { 'neutron':
|
::openstacklib::db::postgresql { 'neutron':
|
||||||
password_hash => postgresql_password($user, $password),
|
password_hash => postgresql_password($user, $password),
|
||||||
|
|
|
@ -19,8 +19,8 @@ class neutron::db::sync(
|
||||||
$db_sync_timeout = 300,
|
$db_sync_timeout = 300,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
exec { 'neutron-db-sync':
|
exec { 'neutron-db-sync':
|
||||||
command => "neutron-db-manage ${extra_params} upgrade heads",
|
command => "neutron-db-manage ${extra_params} upgrade heads",
|
||||||
|
|
|
@ -78,8 +78,8 @@ class neutron::designate (
|
||||||
$ipv6_ptr_zone_prefix_size = $::os_service_default,
|
$ipv6_ptr_zone_prefix_size = $::os_service_default,
|
||||||
$ptr_zone_email = $::os_service_default,
|
$ptr_zone_email = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
neutron_config {
|
neutron_config {
|
||||||
'DEFAULT/external_dns_driver': value => 'designate';
|
'DEFAULT/external_dns_driver': value => 'designate';
|
||||||
|
|
|
@ -395,8 +395,8 @@ class neutron (
|
||||||
$vlan_transparent = $::os_service_default,
|
$vlan_transparent = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if ! is_service_default($use_ssl) and ($use_ssl) {
|
if ! is_service_default($use_ssl) and ($use_ssl) {
|
||||||
if is_service_default($cert_file) {
|
if is_service_default($cert_file) {
|
||||||
|
|
|
@ -87,7 +87,7 @@ class neutron::keystone::auth (
|
||||||
$internal_url = 'http://127.0.0.1:9696',
|
$internal_url = 'http://127.0.0.1:9696',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
if $configure_endpoint {
|
if $configure_endpoint {
|
||||||
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| tag == 'neutron-server-eventlet' |>
|
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| tag == 'neutron-server-eventlet' |>
|
||||||
|
|
|
@ -214,7 +214,7 @@ class neutron::keystone::authtoken(
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
if is_service_default($password) {
|
if is_service_default($password) {
|
||||||
fail('Please set password for neutron service user')
|
fail('Please set password for neutron service user')
|
||||||
|
|
|
@ -129,7 +129,7 @@ class neutron::logging (
|
||||||
$fatal_deprecations = $::os_service_default,
|
$fatal_deprecations = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
oslo::log { 'neutron_config':
|
oslo::log { 'neutron_config':
|
||||||
debug => $debug,
|
debug => $debug,
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# Parameters for puppet-neutron
|
# Parameters for puppet-neutron
|
||||||
#
|
#
|
||||||
class neutron::params {
|
class neutron::params {
|
||||||
include ::openstacklib::defaults
|
include openstacklib::defaults
|
||||||
$pyvers = $::openstacklib::defaults::pyvers
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
|
|
||||||
$client_package = "python${pyvers}-neutronclient"
|
$client_package = "python${pyvers}-neutronclient"
|
||||||
|
|
|
@ -121,7 +121,7 @@ class neutron::plugins::cisco(
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
ensure_resource('file', '/etc/neutron/plugins', {
|
ensure_resource('file', '/etc/neutron/plugins', {
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
|
|
|
@ -107,8 +107,8 @@ class neutron::plugins::midonet (
|
||||||
$midonet_api_port = undef,
|
$midonet_api_port = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if $midonet_api_ip {
|
if $midonet_api_ip {
|
||||||
# If we got midonet_api_ip here, display deprecation warning and use this value.
|
# If we got midonet_api_ip here, display deprecation warning and use this value.
|
||||||
|
|
|
@ -147,8 +147,8 @@ class neutron::plugins::ml2 (
|
||||||
$overlay_ip_version = $::os_service_default,
|
$overlay_ip_version = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if ! $mechanism_drivers {
|
if ! $mechanism_drivers {
|
||||||
warning('Without networking mechanism driver, ml2 will not communicate with L2 agents')
|
warning('Without networking mechanism driver, ml2 will not communicate with L2 agents')
|
||||||
|
|
|
@ -52,7 +52,7 @@ class neutron::plugins::ml2::arista(
|
||||||
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -57,7 +57,7 @@ class neutron::plugins::ml2::arista::l3(
|
||||||
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
if !is_service_default($mlag_config) {
|
if !is_service_default($mlag_config) {
|
||||||
|
|
|
@ -39,8 +39,8 @@ class neutron::plugins::ml2::bagpipe (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -13,8 +13,8 @@ class neutron::plugins::ml2::bigswitch (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
if($::osfamily != 'Redhat') {
|
if($::osfamily != 'Redhat') {
|
||||||
|
|
|
@ -100,7 +100,7 @@ class neutron::plugins::ml2::bigswitch::restproxy (
|
||||||
$thread_pool_size = $::os_service_default,
|
$thread_pool_size = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2::bigswitch
|
require ::neutron::plugins::ml2::bigswitch
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -15,8 +15,8 @@ class neutron::plugins::ml2::cisco (
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
if($::osfamily != 'Redhat') {
|
if($::osfamily != 'Redhat') {
|
||||||
|
|
|
@ -70,8 +70,8 @@ class neutron::plugins::ml2::cisco::nexus (
|
||||||
$vxlan_global_config = true
|
$vxlan_global_config = true
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::plugins::ml2::cisco
|
include neutron::plugins::ml2::cisco
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
'ml2_cisco/managed_physical_network' : value => $managed_physical_network;
|
'ml2_cisco/managed_physical_network' : value => $managed_physical_network;
|
||||||
|
|
|
@ -88,8 +88,8 @@ class neutron::plugins::ml2::cisco::nexus1000v (
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::plugins::ml2::cisco
|
include neutron::plugins::ml2::cisco
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
'ml2_cisco_n1kv/n1kv_vsm_ips' : value => $n1kv_vsm_ip;
|
'ml2_cisco_n1kv/n1kv_vsm_ips' : value => $n1kv_vsm_ip;
|
||||||
|
|
|
@ -119,7 +119,7 @@ define neutron::plugins::ml2::cisco::nexus_creds(
|
||||||
$https_local_certificate = undef,
|
$https_local_certificate = undef,
|
||||||
|
|
||||||
) {
|
) {
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
ensure_resource('file', '/var/lib/neutron/.ssh',
|
ensure_resource('file', '/var/lib/neutron/.ssh',
|
||||||
{
|
{
|
||||||
|
|
|
@ -113,7 +113,7 @@ define neutron::plugins::ml2::cisco::nexus_switch(
|
||||||
$https_local_certificate = $::os_service_default
|
$https_local_certificate = $::os_service_default
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
$section = "ML2_MECH_CISCO_NEXUS:${ip_address}"
|
$section = "ML2_MECH_CISCO_NEXUS:${ip_address}"
|
||||||
$port_mappings = template('neutron/nexus_switch_port_mappings.erb')
|
$port_mappings = template('neutron/nexus_switch_port_mappings.erb')
|
||||||
|
|
|
@ -27,7 +27,7 @@ define neutron::plugins::ml2::cisco::nexus_switch_server(
|
||||||
$hostname = $title,
|
$hostname = $title,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
$section = "ML2_MECH_CISCO_NEXUS:${switch_ip_address}"
|
$section = "ML2_MECH_CISCO_NEXUS:${switch_ip_address}"
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -25,8 +25,8 @@ class neutron::plugins::ml2::cisco::type_nexus_vxlan (
|
||||||
$vni_ranges,
|
$vni_ranges,
|
||||||
$mcast_ranges,
|
$mcast_ranges,
|
||||||
) {
|
) {
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::plugins::ml2::cisco
|
include neutron::plugins::ml2::cisco
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
'ml2_type_nexus_vxlan/vni_ranges' : value => $vni_ranges;
|
'ml2_type_nexus_vxlan/vni_ranges' : value => $vni_ranges;
|
||||||
|
|
|
@ -57,8 +57,8 @@ class neutron::plugins::ml2::cisco::ucsm (
|
||||||
$ucsm_https_verify = $::os_service_default,
|
$ucsm_https_verify = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::plugins::ml2::cisco
|
include neutron::plugins::ml2::cisco
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
'ml2_cisco_ucsm/ucsm_ip' : value => $ucsm_ip;
|
'ml2_cisco_ucsm/ucsm_ip' : value => $ucsm_ip;
|
||||||
|
|
|
@ -53,7 +53,7 @@ class neutron::plugins::ml2::cisco::vts (
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
ensure_resource('package', 'python-cisco-controller',
|
ensure_resource('package', 'python-cisco-controller',
|
||||||
|
|
|
@ -13,7 +13,7 @@ class neutron::plugins::ml2::fujitsu (
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
ensure_resource('package', 'python-networking-fujitsu',
|
ensure_resource('package', 'python-networking-fujitsu',
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,7 +27,7 @@ define neutron::plugins::ml2::mech_driver (
|
||||||
$supported_pci_vendor_devs,
|
$supported_pci_vendor_devs,
|
||||||
){
|
){
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
if ($name == 'sriovnicswitch') {
|
if ($name == 'sriovnicswitch') {
|
||||||
neutron_plugin_sriov {
|
neutron_plugin_sriov {
|
||||||
|
|
|
@ -15,8 +15,8 @@ class neutron::plugins::ml2::mellanox (
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
if($::osfamily != 'RedHat') {
|
if($::osfamily != 'RedHat') {
|
||||||
|
|
|
@ -51,7 +51,7 @@ class neutron::plugins::ml2::mellanox::mlnx_sdn_assist (
|
||||||
$bind_normal_ports_physnets = [],
|
$bind_normal_ports_physnets = [],
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -25,7 +25,7 @@ class neutron::plugins::ml2::midonet (
|
||||||
$project_id = 'services',
|
$project_id = 'services',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
'MIDONET/midonet_uri' : value => $midonet_uri;
|
'MIDONET/midonet_uri' : value => $midonet_uri;
|
||||||
|
|
|
@ -36,8 +36,8 @@ class neutron::plugins::ml2::networking_ansible(
|
||||||
$coordination_uri = $::os_service_default,
|
$coordination_uri = $::os_service_default,
|
||||||
$package_ensure = 'present'
|
$package_ensure = 'present'
|
||||||
) {
|
) {
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if($::osfamily != 'RedHat') {
|
if($::osfamily != 'RedHat') {
|
||||||
# Drivers are only packaged for RedHat at this time
|
# Drivers are only packaged for RedHat at this time
|
||||||
|
|
|
@ -41,7 +41,7 @@ define neutron::plugins::ml2::networking_ansible_host(
|
||||||
$hostname = $title,
|
$hostname = $title,
|
||||||
$manage_vlans = undef,
|
$manage_vlans = undef,
|
||||||
) {
|
) {
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
if (($ansible_ssh_pass == undef and $ansible_ssh_private_key_file == undef) or
|
if (($ansible_ssh_pass == undef and $ansible_ssh_private_key_file == undef) or
|
||||||
|
|
|
@ -14,8 +14,8 @@ class neutron::plugins::ml2::networking_baremetal(
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if($::osfamily != 'RedHat') {
|
if($::osfamily != 'RedHat') {
|
||||||
# Drivers are only packaged for RedHat at this time
|
# Drivers are only packaged for RedHat at this time
|
||||||
|
|
|
@ -57,8 +57,8 @@ class neutron::plugins::ml2::nuage (
|
||||||
$nuage_default_allow_non_ip = false,
|
$nuage_default_allow_non_ip = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
file { '/etc/neutron/plugins/nuage':
|
file { '/etc/neutron/plugins/nuage':
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
|
|
|
@ -54,7 +54,7 @@ class neutron::plugins::ml2::opendaylight (
|
||||||
$odl_features = $::os_service_default,
|
$odl_features = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
ensure_resource('package', 'python-networking-odl',
|
ensure_resource('package', 'python-networking-odl',
|
||||||
|
|
|
@ -123,7 +123,7 @@ class neutron::plugins::ml2::ovn(
|
||||||
$ovn_emit_need_to_frag = $::os_service_default,
|
$ovn_emit_need_to_frag = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
if ! is_service_default($ovn_l3_mode) {
|
if ! is_service_default($ovn_l3_mode) {
|
||||||
|
|
|
@ -52,7 +52,7 @@ define neutron::plugins::ml2::type_driver (
|
||||||
$max_header_size
|
$max_header_size
|
||||||
){
|
){
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
if ($name == 'flat') {
|
if ($name == 'flat') {
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -26,7 +26,7 @@ class neutron::plugins::ml2::vpp (
|
||||||
$etcd_user = $::os_service_default,
|
$etcd_user = $::os_service_default,
|
||||||
$etcd_pass = $::os_service_default,
|
$etcd_pass = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
require ::neutron::plugins::ml2
|
require ::neutron::plugins::ml2
|
||||||
|
|
||||||
neutron_plugin_ml2 {
|
neutron_plugin_ml2 {
|
||||||
|
|
|
@ -81,8 +81,8 @@ class neutron::plugins::nsx (
|
||||||
$metadata_proxy_uuid = undef,
|
$metadata_proxy_uuid = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
file { '/etc/neutron/plugins/vmware':
|
file { '/etc/neutron/plugins/vmware':
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
|
|
|
@ -52,8 +52,8 @@ class neutron::plugins::nuage (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
file { '/etc/neutron/plugins/nuage':
|
file { '/etc/neutron/plugins/nuage':
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
|
|
|
@ -40,8 +40,8 @@ class neutron::plugins::nvp (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
Package['neutron'] -> Package['neutron-plugin-nvp']
|
Package['neutron'] -> Package['neutron-plugin-nvp']
|
||||||
|
|
||||||
|
|
|
@ -66,8 +66,8 @@ class neutron::plugins::opencontrail (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
validate_legacy(Array, 'validate_array', $contrail_extensions)
|
validate_legacy(Array, 'validate_array', $contrail_extensions)
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
define neutron::plugins::ovs::bridge {
|
define neutron::plugins::ovs::bridge {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
$mapping = split($name, ':')
|
$mapping = split($name, ':')
|
||||||
$bridge = $mapping[1]
|
$bridge = $mapping[1]
|
||||||
|
|
|
@ -114,7 +114,7 @@ class neutron::plugins::ovs::opendaylight (
|
||||||
$enable_ipv6 = false,
|
$enable_ipv6 = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
# Handle the case where ODL controller is also on this host
|
# Handle the case where ODL controller is also on this host
|
||||||
Service<| title == 'opendaylight' |> -> Exec <| title == 'Wait for NetVirt OVSDB to come up' |>
|
Service<| title == 'opendaylight' |> -> Exec <| title == 'Wait for NetVirt OVSDB to come up' |>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
define neutron::plugins::ovs::port {
|
define neutron::plugins::ovs::port {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
$mapping = split($name, ':')
|
$mapping = split($name, ':')
|
||||||
vs_port {$mapping[1]:
|
vs_port {$mapping[1]:
|
||||||
|
|
|
@ -121,8 +121,8 @@ class neutron::plugins::plumgrid (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
ensure_resource('file', '/etc/neutron/plugins/plumgrid', {
|
ensure_resource('file', '/etc/neutron/plugins/plumgrid', {
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
|
|
|
@ -28,8 +28,8 @@ class neutron::policy (
|
||||||
$policy_path = '/etc/neutron/policy.json',
|
$policy_path = '/etc/neutron/policy.json',
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
validate_legacy(Hash, 'validate_hash', $policies)
|
validate_legacy(Hash, 'validate_hash', $policies)
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@ class neutron::quota (
|
||||||
$quota_vip = $::os_service_default,
|
$quota_vip = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
neutron_config {
|
neutron_config {
|
||||||
'quotas/default_quota': value => $default_quota;
|
'quotas/default_quota': value => $default_quota;
|
||||||
|
|
|
@ -25,7 +25,7 @@ class neutron::rootwrap (
|
||||||
$xenapi_connection_password = $::os_service_default,
|
$xenapi_connection_password = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
neutron_rootwrap_config {
|
neutron_rootwrap_config {
|
||||||
'xenapi/xenapi_connection_url': value => $xenapi_connection_url;
|
'xenapi/xenapi_connection_url': value => $xenapi_connection_url;
|
||||||
|
|
|
@ -294,11 +294,11 @@ class neutron::server (
|
||||||
$ovs_integration_bridge = $::os_service_default,
|
$ovs_integration_bridge = $::os_service_default,
|
||||||
) inherits ::neutron::params {
|
) inherits ::neutron::params {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::db
|
include neutron::db
|
||||||
include ::neutron::policy
|
include neutron::policy
|
||||||
# Work-around LP#1551974. neutron requires the keystoneclient to auth tokens
|
# Work-around LP#1551974. neutron requires the keystoneclient to auth tokens
|
||||||
include ::keystone::client
|
include keystone::client
|
||||||
|
|
||||||
if !is_service_default($default_availability_zones) {
|
if !is_service_default($default_availability_zones) {
|
||||||
validate_legacy(Array, 'validate_array', $default_availability_zones)
|
validate_legacy(Array, 'validate_array', $default_availability_zones)
|
||||||
|
@ -367,7 +367,7 @@ class neutron::server (
|
||||||
}
|
}
|
||||||
|
|
||||||
if $sync_db {
|
if $sync_db {
|
||||||
include ::neutron::db::sync
|
include neutron::db::sync
|
||||||
}
|
}
|
||||||
|
|
||||||
neutron_config {
|
neutron_config {
|
||||||
|
@ -418,7 +418,7 @@ class neutron::server (
|
||||||
|
|
||||||
if ($auth_strategy == 'keystone') {
|
if ($auth_strategy == 'keystone') {
|
||||||
|
|
||||||
include ::neutron::keystone::authtoken
|
include neutron::keystone::authtoken
|
||||||
|
|
||||||
neutron_api_config {
|
neutron_api_config {
|
||||||
'filter:authtoken/admin_tenant_name': ensure => absent;
|
'filter:authtoken/admin_tenant_name': ensure => absent;
|
||||||
|
@ -456,7 +456,7 @@ class neutron::server (
|
||||||
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
|
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
|
||||||
}
|
}
|
||||||
} elsif $service_name == 'httpd' {
|
} elsif $service_name == 'httpd' {
|
||||||
include ::apache::params
|
include apache::params
|
||||||
service { 'neutron-server':
|
service { 'neutron-server':
|
||||||
ensure => 'stopped',
|
ensure => 'stopped',
|
||||||
name => $::neutron::params::server_service,
|
name => $::neutron::params::server_service,
|
||||||
|
|
|
@ -105,7 +105,7 @@ class neutron::server::notifications (
|
||||||
$endpoint_type = $::os_service_default,
|
$endpoint_type = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
if is_service_default($tenant_id) and (! $tenant_name) {
|
if is_service_default($tenant_id) and (! $tenant_name) {
|
||||||
fail('You must provide either tenant_name or tenant_id.')
|
fail('You must provide either tenant_name or tenant_id.')
|
||||||
|
|
|
@ -79,7 +79,7 @@ class neutron::server::placement (
|
||||||
$endpoint_type = $::os_service_default,
|
$endpoint_type = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
|
|
||||||
neutron_config {
|
neutron_config {
|
||||||
'placement/auth_url': value => $auth_url;
|
'placement/auth_url': value => $auth_url;
|
||||||
|
|
|
@ -44,8 +44,8 @@ class neutron::services::bgpvpn (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
#This package just include the service API
|
#This package just include the service API
|
||||||
ensure_resource( 'package', $::neutron::params::bgpvpn_plugin_package, {
|
ensure_resource( 'package', $::neutron::params::bgpvpn_plugin_package, {
|
||||||
|
|
|
@ -54,8 +54,8 @@ class neutron::services::fwaas (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if ($::osfamily == 'Debian') {
|
if ($::osfamily == 'Debian') {
|
||||||
# Debian platforms
|
# Debian platforms
|
||||||
|
|
|
@ -53,8 +53,8 @@ class neutron::services::l2gw (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
if !is_service_default($service_providers) {
|
if !is_service_default($service_providers) {
|
||||||
validate_legacy(Array, 'validate_array', $service_providers)
|
validate_legacy(Array, 'validate_array', $service_providers)
|
||||||
|
|
|
@ -50,8 +50,8 @@ class neutron::services::sfc (
|
||||||
$purge_config = false,
|
$purge_config = false,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
|
|
||||||
ensure_resource( 'package', $::neutron::params::sfc_package, {
|
ensure_resource( 'package', $::neutron::params::sfc_package, {
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
|
|
|
@ -43,7 +43,7 @@ class neutron::services::vpnaas (
|
||||||
$service_providers = $::os_service_default,
|
$service_providers = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
if !is_service_default($service_providers) {
|
if !is_service_default($service_providers) {
|
||||||
warning("service_providers in neutron::services::vpnaas is deprecated in newton release, \
|
warning("service_providers in neutron::services::vpnaas is deprecated in newton release, \
|
||||||
please use service provider in neutron::server class")
|
please use service provider in neutron::server class")
|
||||||
|
|
|
@ -121,12 +121,12 @@ class neutron::wsgi::apache (
|
||||||
$custom_wsgi_process_options = {},
|
$custom_wsgi_process_options = {},
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include neutron::deps
|
||||||
include ::neutron::params
|
include neutron::params
|
||||||
include ::apache
|
include apache
|
||||||
include ::apache::mod::wsgi
|
include apache::mod::wsgi
|
||||||
if $ssl {
|
if $ssl {
|
||||||
include ::apache::mod::ssl
|
include apache::mod::ssl
|
||||||
}
|
}
|
||||||
|
|
||||||
# The httpd package is untagged, but needs to have ordering enforced,
|
# The httpd package is untagged, but needs to have ordering enforced,
|
||||||
|
|
|
@ -6,12 +6,12 @@ describe 'basic neutron' do
|
||||||
|
|
||||||
it 'should work with no errors' do
|
it 'should work with no errors' do
|
||||||
pp= <<-EOS
|
pp= <<-EOS
|
||||||
include ::openstack_integration
|
include openstack_integration
|
||||||
include ::openstack_integration::repos
|
include openstack_integration::repos
|
||||||
include ::openstack_integration::rabbitmq
|
include openstack_integration::rabbitmq
|
||||||
include ::openstack_integration::mysql
|
include openstack_integration::mysql
|
||||||
include ::openstack_integration::keystone
|
include openstack_integration::keystone
|
||||||
include ::openstack_integration::neutron
|
include openstack_integration::neutron
|
||||||
EOS
|
EOS
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ describe 'neutron::keystone::auth' do
|
||||||
|
|
||||||
context 'when configuring neutron-server' do
|
context 'when configuring neutron-server' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'test',
|
password => 'test',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }"
|
class { 'neutron::server': }"
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::cisco' do
|
describe 'neutron::plugins::cisco' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::midonet' do
|
describe 'neutron::plugins::midonet' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -21,7 +21,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::arista::l3' do
|
describe 'neutron::plugins::ml2::arista::l3' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -21,7 +21,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::arista' do
|
describe 'neutron::plugins::ml2::arista' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::bigswitch::restproxy' do
|
describe 'neutron::plugins::ml2::bigswitch::restproxy' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::bigswitch' do
|
describe 'neutron::plugins::ml2::bigswitch' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::cisco::nexus1000v' do
|
describe 'neutron::plugins::ml2::cisco::nexus1000v' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::cisco::nexus' do
|
describe 'neutron::plugins::ml2::cisco::nexus' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::cisco' do
|
describe 'neutron::plugins::ml2::cisco' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do
|
describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::cisco::ucsm' do
|
describe 'neutron::plugins::ml2::cisco::ucsm' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
|
@ -2,7 +2,7 @@ require 'spec_helper'
|
||||||
|
|
||||||
describe 'neutron::plugins::ml2::cisco::vts' do
|
describe 'neutron::plugins::ml2::cisco::vts' do
|
||||||
let :pre_condition do
|
let :pre_condition do
|
||||||
"class { '::neutron::keystone::authtoken':
|
"class { 'neutron::keystone::authtoken':
|
||||||
password => 'passw0rd',
|
password => 'passw0rd',
|
||||||
}
|
}
|
||||||
class { 'neutron::server': }
|
class { 'neutron::server': }
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue