Browse Source

Convert all class usage to relative names

Change-Id: I229428feb1cb4fc7b551d2654328a8f0bb349910
changes/12/697912/1
Tobias Urdin 2 years ago
parent
commit
94673ed159
  1. 4
      README.md
  2. 6
      examples/cisco_ml2.pp
  3. 22
      examples/neutron.pp
  4. 6
      examples/neutron_l3_with_to_uuid.pp
  5. 8
      examples/neutron_with_pacemaker.pp
  6. 8
      examples/neutron_wsgi.pp
  7. 2
      lib/puppet/provider/neutron.rb
  8. 4
      manifests/agents/bagpipe.pp
  9. 4
      manifests/agents/bgp_dragent.pp
  10. 4
      manifests/agents/bigswitch.pp
  11. 4
      manifests/agents/dhcp.pp
  12. 4
      manifests/agents/l2gw.pp
  13. 4
      manifests/agents/l3.pp
  14. 4
      manifests/agents/metadata.pp
  15. 4
      manifests/agents/metering.pp
  16. 4
      manifests/agents/ml2/linuxbridge.pp
  17. 4
      manifests/agents/ml2/mlnx.pp
  18. 4
      manifests/agents/ml2/networking_baremetal.pp
  19. 4
      manifests/agents/ml2/ovs.pp
  20. 4
      manifests/agents/ml2/sriov.pp
  21. 4
      manifests/agents/ml2/vpp.pp
  22. 4
      manifests/agents/n1kv_vem.pp
  23. 4
      manifests/agents/ovn_metadata.pp
  24. 4
      manifests/agents/vpnaas.pp
  25. 4
      manifests/client.pp
  26. 2
      manifests/config.pp
  27. 2
      manifests/db.pp
  28. 2
      manifests/db/mysql.pp
  29. 2
      manifests/db/postgresql.pp
  30. 4
      manifests/db/sync.pp
  31. 4
      manifests/designate.pp
  32. 4
      manifests/init.pp
  33. 2
      manifests/keystone/auth.pp
  34. 2
      manifests/keystone/authtoken.pp
  35. 2
      manifests/logging.pp
  36. 2
      manifests/params.pp
  37. 2
      manifests/plugins/cisco.pp
  38. 4
      manifests/plugins/midonet.pp
  39. 4
      manifests/plugins/ml2.pp
  40. 2
      manifests/plugins/ml2/arista.pp
  41. 2
      manifests/plugins/ml2/arista/l3.pp
  42. 4
      manifests/plugins/ml2/bagpipe.pp
  43. 4
      manifests/plugins/ml2/bigswitch.pp
  44. 2
      manifests/plugins/ml2/bigswitch/restproxy.pp
  45. 4
      manifests/plugins/ml2/cisco.pp
  46. 4
      manifests/plugins/ml2/cisco/nexus.pp
  47. 4
      manifests/plugins/ml2/cisco/nexus1000v.pp
  48. 2
      manifests/plugins/ml2/cisco/nexus_creds.pp
  49. 2
      manifests/plugins/ml2/cisco/nexus_switch.pp
  50. 2
      manifests/plugins/ml2/cisco/nexus_switch_server.pp
  51. 4
      manifests/plugins/ml2/cisco/type_nexus_vxlan.pp
  52. 4
      manifests/plugins/ml2/cisco/ucsm.pp
  53. 2
      manifests/plugins/ml2/cisco/vts.pp
  54. 2
      manifests/plugins/ml2/fujitsu.pp
  55. 2
      manifests/plugins/ml2/mech_driver.pp
  56. 4
      manifests/plugins/ml2/mellanox.pp
  57. 2
      manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
  58. 2
      manifests/plugins/ml2/midonet.pp
  59. 4
      manifests/plugins/ml2/networking_ansible.pp
  60. 2
      manifests/plugins/ml2/networking_ansible_host.pp
  61. 4
      manifests/plugins/ml2/networking_baremetal.pp
  62. 4
      manifests/plugins/ml2/nuage.pp
  63. 2
      manifests/plugins/ml2/opendaylight.pp
  64. 2
      manifests/plugins/ml2/ovn.pp
  65. 2
      manifests/plugins/ml2/type_driver.pp
  66. 2
      manifests/plugins/ml2/vpp.pp
  67. 4
      manifests/plugins/nsx.pp
  68. 4
      manifests/plugins/nuage.pp
  69. 4
      manifests/plugins/nvp.pp
  70. 4
      manifests/plugins/opencontrail.pp
  71. 2
      manifests/plugins/ovs/bridge.pp
  72. 2
      manifests/plugins/ovs/opendaylight.pp
  73. 2
      manifests/plugins/ovs/port.pp
  74. 4
      manifests/plugins/plumgrid.pp
  75. 4
      manifests/policy.pp
  76. 2
      manifests/quota.pp
  77. 2
      manifests/rootwrap.pp
  78. 14
      manifests/server.pp
  79. 2
      manifests/server/notifications.pp
  80. 2
      manifests/server/placement.pp
  81. 4
      manifests/services/bgpvpn.pp
  82. 4
      manifests/services/fwaas.pp
  83. 4
      manifests/services/l2gw.pp
  84. 4
      manifests/services/sfc.pp
  85. 2
      manifests/services/vpnaas.pp
  86. 10
      manifests/wsgi/apache.pp
  87. 12
      spec/acceptance/basic_neutron_spec.rb
  88. 2
      spec/classes/neutron_keystone_auth_spec.rb
  89. 2
      spec/classes/neutron_plugins_cisco_spec.rb
  90. 2
      spec/classes/neutron_plugins_midonet_spec.rb
  91. 2
      spec/classes/neutron_plugins_ml2_arista_l3_spec.rb
  92. 2
      spec/classes/neutron_plugins_ml2_arista_spec.rb
  93. 2
      spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb
  94. 2
      spec/classes/neutron_plugins_ml2_bigswitch_spec.rb
  95. 2
      spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb
  96. 2
      spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb
  97. 2
      spec/classes/neutron_plugins_ml2_cisco_spec.rb
  98. 2
      spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb
  99. 2
      spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
  100. 2
      spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb

4
README.md

@ -50,7 +50,7 @@ To utilize the neutron module's functionality you will need to declare multiple
```puppet
# enable the neutron service
class { '::neutron':
class { 'neutron':
enabled => true,
bind_host => '127.0.0.1',
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
class { '::neutron::plugins::ml2':
class { 'neutron::plugins::ml2':
type_drivers => ['vxlan'],
tenant_network_types => ['vxlan'],
vxlan_group => '239.1.1.1',

6
examples/cisco_ml2.pp

@ -1,16 +1,16 @@
class { '::neutron':
class { 'neutron':
enabled => true,
bind_host => '127.0.0.1',
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
debug => true,
}
class { '::neutron::server':
class { 'neutron::server':
www_authenticate_uri => 'http://127.0.0.1:5000',
auth_password => 'keystone_secret',
}
class { '::neutron::plugins::ml2':
class { 'neutron::plugins::ml2':
type_drivers => ['vlan', 'nexus_vxlan'],
tenant_network_types => ['nexus_vxlan'],
network_vlan_ranges => ['physnet:2000:2020'],

22
examples/neutron.pp

@ -2,39 +2,39 @@
# General Neutron stuff
# Configures everything in neutron.conf
class { '::neutron':
class { 'neutron':
allow_overlapping_ips => true,
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
service_plugins => ['metering']
}
# The API server talks to keystone for authorisation
class { '::neutron::server':
class { 'neutron::server':
auth_password => 'password',
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
}
# Configure nova notifications system
class { '::neutron::server::notifications':
class { 'neutron::server::notifications':
tenant_name => 'admin',
password => 'secrete',
}
# Various agents
class { '::neutron::agents::dhcp': }
class { '::neutron::agents::l3': }
class { '::neutron::agents::vpnaas': }
class { '::neutron::agents::metering': }
class { 'neutron::agents::dhcp': }
class { 'neutron::agents::l3': }
class { 'neutron::agents::vpnaas': }
class { 'neutron::agents::metering': }
# This plugin configures Neutron for OVS on the server
# Agent
class { '::neutron::agents::ml2::ovs':
class { 'neutron::agents::ml2::ovs':
local_ip => '192.168.1.1',
tunnel_types => ['vxlan']
}
# ml2 plugin with vxlan as ml2 driver and ovs as mechanism driver
class { '::neutron::plugins::ml2':
class { 'neutron::plugins::ml2':
type_drivers => ['vxlan'],
tenant_network_types => ['vxlan'],
vxlan_group => '239.1.1.1',
@ -45,14 +45,14 @@ class { '::neutron::plugins::ml2':
### Compute Nodes:
# Generally, any machine with a neutron element running on it talks
# over Rabbit and needs to know if overlapping IPs (namespaces) are in use
class { '::neutron':
class { 'neutron':
allow_overlapping_ips => true,
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
}
# The agent/plugin combo also needs installed on clients
# Agent
class { '::neutron::agents::ml2::ovs':
class { 'neutron::agents::ml2::ovs':
local_ip => '192.168.1.11',
tunnel_types => ['vxlan']
}

6
examples/neutron_l3_with_to_uuid.pp

@ -6,19 +6,19 @@
# This manifest extends the one shown in base_provision.pp
#
class { '::neutron':
class { 'neutron':
allow_overlapping_ips => true,
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
service_plugins => ['router']
}
class { '::neutron::server':
class { 'neutron::server':
auth_password => 'password',
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
}
# configure l3-agent to use the new router by name
class { '::neutron::agents::l3':
class { 'neutron::agents::l3':
enabled => true,
use_namespaces => false,
require => Neutron_router['demo_router'],

8
examples/neutron_with_pacemaker.pp

@ -22,24 +22,24 @@
#
# sudo pcs constraint colocation add neutron_server_service with neutron_vip
class { '::neutron':
class { 'neutron':
allow_overlapping_ips => true,
service_plugins => [ 'dhcp', 'l3' ]
}
class { '::neutron::server':
class { 'neutron::server':
enabled => false,
manage_service => false,
keystone_password => 'password',
connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
}
class { '::neutron::agents::dhcp':
class { 'neutron::agents::dhcp':
enabled => false,
manage_service => false,
}
class { '::neutron::agents::l3':
class { 'neutron::agents::l3':
enabled => false,
manage_service => false,
}

8
examples/neutron_wsgi.pp

@ -1,15 +1,15 @@
# Example of manifest to deploy Neutron API in WSGI with Apache
class { '::neutron':
class { 'neutron':
allow_overlapping_ips => true,
default_transport_url => 'rabbit://guest:password@localhost:5672/neutron',
}
class { '::neutron::server':
class { 'neutron::server':
auth_password => 'password',
database_connection => 'mysql+pymysql://neutron:password@192.168.1.1/neutron',
service_name => 'httpd',
}
include ::apache
class { '::neutron::wsgi::apache':
include apache
class { 'neutron::wsgi::apache':
ssl => false,
}

2
lib/puppet/provider/neutron.rb

@ -236,7 +236,7 @@ class Puppet::Provider::Neutron < Puppet::Provider::Openstack
instance = Puppet::Type.type(instance_type).instances.find do |i|
# We need to check against the Default domain name because of
# 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.
# TODO(aschultz): remove ::domain lookup as part of M-cycle
i.provider.name == name || i.provider.name == "#{name}::#{domain}"

4
manifests/agents/bagpipe.pp

@ -90,8 +90,8 @@ class neutron::agents::bagpipe (
$local_address = $::ipaddress,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_bgpvpn_bagpipe_config':
purge => $purge_config,

4
manifests/agents/bgp_dragent.pp

@ -54,8 +54,8 @@ class neutron::agents::bgp_dragent(
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_bgp_dragent_config':
purge => $purge_config,

4
manifests/agents/bigswitch.pp

@ -23,8 +23,8 @@ class neutron::agents::bigswitch (
$agent_enabled = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if($::osfamily != 'Redhat') {
fail("Unsupported osfamily ${::osfamily}")

4
manifests/agents/dhcp.pp

@ -125,8 +125,8 @@ class neutron::agents::dhcp (
$ovsdb_agent_ssl_ca_file = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
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.')

4
manifests/agents/l2gw.pp

@ -86,8 +86,8 @@ class neutron::agents::l2gw (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_l2gw_agent_config':
purge => $purge_config,

4
manifests/agents/l3.pp

@ -118,8 +118,8 @@ class neutron::agents::l3 (
$radvd_user = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_l3_agent_config':
purge => $purge_config,

4
manifests/agents/metadata.pp

@ -89,8 +89,8 @@ class neutron::agents::metadata (
$metadata_ip = undef,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_metadata_agent_config':
purge => $purge_config,

4
manifests/agents/metering.pp

@ -66,8 +66,8 @@ class neutron::agents::metering (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_metering_agent_config':
purge => $purge_config,

4
manifests/agents/ml2/linuxbridge.pp

@ -88,8 +88,8 @@ class neutron::agents::ml2::linuxbridge (
validate_legacy(Array, 'validate_array', $physical_interface_mappings)
validate_legacy(Array, 'validate_array', $bridge_mappings)
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_agent_linuxbridge':
purge => $purge_config,

4
manifests/agents/ml2/mlnx.pp

@ -74,8 +74,8 @@ class neutron::agents::ml2::mlnx (
$enable_multi_interface_driver_cache_maintenance = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
$mlnx_agent_package = $::neutron::params::mlnx_agent_package
$mlnx_agent_service = $::neutron::params::mlnx_agent_service

4
manifests/agents/ml2/networking_baremetal.pp

@ -123,8 +123,8 @@ class neutron::agents::ml2::networking_baremetal (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if($::osfamily != 'RedHat') {
# Drivers are only packaged for RedHat at this time

4
manifests/agents/ml2/ovs.pp

@ -194,8 +194,8 @@ class neutron::agents::ml2::ovs (
$of_interface = undef,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if $enable_dpdk and ! $manage_vswitch {
fail('Enabling DPDK without manage vswitch does not have any effect')

4
manifests/agents/ml2/sriov.pp

@ -81,8 +81,8 @@ class neutron::agents::ml2::sriov (
$number_of_vfs = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_sriov_agent_config':
purge => $purge_config,

4
manifests/agents/ml2/vpp.pp

@ -53,8 +53,8 @@ class neutron::agents::ml2::vpp (
$etcd_pass = $::os_service_default,
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'neutron_agent_vpp':
purge => $purge_config,

4
manifests/agents/n1kv_vem.pp

@ -121,8 +121,8 @@ class neutron::agents::n1kv_vem (
$fastpath_flood = 'enable'
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
require ::vswitch::ovs
Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] }

4
manifests/agents/ovn_metadata.pp

@ -140,8 +140,8 @@ class neutron::agents::ovn_metadata (
$ovn_remote_probe_interval = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
resources { 'ovn_metadata_agent_config':
purge => $purge_config,

4
manifests/agents/vpnaas.pp

@ -46,8 +46,8 @@ class neutron::agents::vpnaas (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
case $vpn_device_driver {
/\.OpenSwan/: {

4
manifests/client.pp

@ -12,8 +12,8 @@ class neutron::client (
$package_ensure = present
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
package { 'python-neutronclient':
ensure => $package_ensure,

2
manifests/config.pp

@ -127,7 +127,7 @@ class neutron::config (
$plugin_nvp_config = {},
) {
include ::neutron::deps
include neutron::deps
validate_legacy(Hash, 'validate_hash', $server_config)
validate_legacy(Hash, 'validate_hash', $api_config)

2
manifests/db.pp

@ -62,7 +62,7 @@ class neutron::db (
$database_idle_timeout = undef,
) {
include ::neutron::deps
include neutron::deps
if $database_idle_timeout {
warning('The database_idle_timeout parameter is deprecated. Please use \

2
manifests/db/mysql.pp

@ -40,7 +40,7 @@ class neutron::db::mysql (
$collate = 'utf8_general_ci',
) {
include ::neutron::deps
include neutron::deps
validate_legacy(String, 'validate_string', $password)

2
manifests/db/postgresql.pp

@ -32,7 +32,7 @@ class neutron::db::postgresql(
$privileges = 'ALL',
) {
include ::neutron::deps
include neutron::deps
::openstacklib::db::postgresql { 'neutron':
password_hash => postgresql_password($user, $password),

4
manifests/db/sync.pp

@ -19,8 +19,8 @@ class neutron::db::sync(
$db_sync_timeout = 300,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
exec { 'neutron-db-sync':
command => "neutron-db-manage ${extra_params} upgrade heads",

4
manifests/designate.pp

@ -78,8 +78,8 @@ class neutron::designate (
$ipv6_ptr_zone_prefix_size = $::os_service_default,
$ptr_zone_email = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
neutron_config {
'DEFAULT/external_dns_driver': value => 'designate';

4
manifests/init.pp

@ -395,8 +395,8 @@ class neutron (
$vlan_transparent = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if ! is_service_default($use_ssl) and ($use_ssl) {
if is_service_default($cert_file) {

2
manifests/keystone/auth.pp

@ -87,7 +87,7 @@ class neutron::keystone::auth (
$internal_url = 'http://127.0.0.1:9696',
) {
include ::neutron::deps
include neutron::deps
if $configure_endpoint {
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| tag == 'neutron-server-eventlet' |>

2
manifests/keystone/authtoken.pp

@ -214,7 +214,7 @@ class neutron::keystone::authtoken(
$service_token_roles_required = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
if is_service_default($password) {
fail('Please set password for neutron service user')

2
manifests/logging.pp

@ -129,7 +129,7 @@ class neutron::logging (
$fatal_deprecations = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
oslo::log { 'neutron_config':
debug => $debug,

2
manifests/params.pp

@ -3,7 +3,7 @@
# Parameters for puppet-neutron
#
class neutron::params {
include ::openstacklib::defaults
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-neutronclient"

2
manifests/plugins/cisco.pp

@ -121,7 +121,7 @@ class neutron::plugins::cisco(
$purge_config = false,
)
{
include ::neutron::deps
include neutron::deps
ensure_resource('file', '/etc/neutron/plugins', {
ensure => directory,

4
manifests/plugins/midonet.pp

@ -107,8 +107,8 @@ class neutron::plugins::midonet (
$midonet_api_port = undef,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if $midonet_api_ip {
# If we got midonet_api_ip here, display deprecation warning and use this value.

4
manifests/plugins/ml2.pp

@ -147,8 +147,8 @@ class neutron::plugins::ml2 (
$overlay_ip_version = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if ! $mechanism_drivers {
warning('Without networking mechanism driver, ml2 will not communicate with L2 agents')

2
manifests/plugins/ml2/arista.pp

@ -52,7 +52,7 @@ class neutron::plugins::ml2::arista(
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
neutron_plugin_ml2 {

2
manifests/plugins/ml2/arista/l3.pp

@ -57,7 +57,7 @@ class neutron::plugins::ml2::arista::l3(
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
if !is_service_default($mlag_config) {

4
manifests/plugins/ml2/bagpipe.pp

@ -39,8 +39,8 @@ class neutron::plugins::ml2::bagpipe (
$package_ensure = 'present',
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
neutron_plugin_ml2 {

4
manifests/plugins/ml2/bigswitch.pp

@ -13,8 +13,8 @@ class neutron::plugins::ml2::bigswitch (
$package_ensure = 'present',
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
if($::osfamily != 'Redhat') {

2
manifests/plugins/ml2/bigswitch/restproxy.pp

@ -100,7 +100,7 @@ class neutron::plugins::ml2::bigswitch::restproxy (
$thread_pool_size = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2::bigswitch
neutron_plugin_ml2 {

4
manifests/plugins/ml2/cisco.pp

@ -15,8 +15,8 @@ class neutron::plugins::ml2::cisco (
$package_ensure = 'present'
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
if($::osfamily != 'Redhat') {

4
manifests/plugins/ml2/cisco/nexus.pp

@ -70,8 +70,8 @@ class neutron::plugins::ml2::cisco::nexus (
$vxlan_global_config = true
) {
include ::neutron::deps
include ::neutron::plugins::ml2::cisco
include neutron::deps
include neutron::plugins::ml2::cisco
neutron_plugin_ml2 {
'ml2_cisco/managed_physical_network' : value => $managed_physical_network;

4
manifests/plugins/ml2/cisco/nexus1000v.pp

@ -88,8 +88,8 @@ class neutron::plugins::ml2::cisco::nexus1000v (
)
{
include ::neutron::deps
include ::neutron::plugins::ml2::cisco
include neutron::deps
include neutron::plugins::ml2::cisco
neutron_plugin_ml2 {
'ml2_cisco_n1kv/n1kv_vsm_ips' : value => $n1kv_vsm_ip;

2
manifests/plugins/ml2/cisco/nexus_creds.pp

@ -119,7 +119,7 @@ define neutron::plugins::ml2::cisco::nexus_creds(
$https_local_certificate = undef,
) {
include ::neutron::deps
include neutron::deps
ensure_resource('file', '/var/lib/neutron/.ssh',
{

2
manifests/plugins/ml2/cisco/nexus_switch.pp

@ -113,7 +113,7 @@ define neutron::plugins::ml2::cisco::nexus_switch(
$https_local_certificate = $::os_service_default
) {
include ::neutron::deps
include neutron::deps
$section = "ML2_MECH_CISCO_NEXUS:${ip_address}"
$port_mappings = template('neutron/nexus_switch_port_mappings.erb')

2
manifests/plugins/ml2/cisco/nexus_switch_server.pp

@ -27,7 +27,7 @@ define neutron::plugins::ml2::cisco::nexus_switch_server(
$hostname = $title,
) {
include ::neutron::deps
include neutron::deps
$section = "ML2_MECH_CISCO_NEXUS:${switch_ip_address}"
neutron_plugin_ml2 {

4
manifests/plugins/ml2/cisco/type_nexus_vxlan.pp

@ -25,8 +25,8 @@ class neutron::plugins::ml2::cisco::type_nexus_vxlan (
$vni_ranges,
$mcast_ranges,
) {
include ::neutron::deps
include ::neutron::plugins::ml2::cisco
include neutron::deps
include neutron::plugins::ml2::cisco
neutron_plugin_ml2 {
'ml2_type_nexus_vxlan/vni_ranges' : value => $vni_ranges;

4
manifests/plugins/ml2/cisco/ucsm.pp

@ -57,8 +57,8 @@ class neutron::plugins::ml2::cisco::ucsm (
$ucsm_https_verify = $::os_service_default,
) {
include ::neutron::deps
include ::neutron::plugins::ml2::cisco
include neutron::deps
include neutron::plugins::ml2::cisco
neutron_plugin_ml2 {
'ml2_cisco_ucsm/ucsm_ip' : value => $ucsm_ip;

2
manifests/plugins/ml2/cisco/vts.pp

@ -53,7 +53,7 @@ class neutron::plugins::ml2::cisco::vts (
$package_ensure = 'present'
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
ensure_resource('package', 'python-cisco-controller',

2
manifests/plugins/ml2/fujitsu.pp

@ -13,7 +13,7 @@ class neutron::plugins::ml2::fujitsu (
$package_ensure = 'present'
) {
include ::neutron::deps
include neutron::deps
ensure_resource('package', 'python-networking-fujitsu',
{

2
manifests/plugins/ml2/mech_driver.pp

@ -27,7 +27,7 @@ define neutron::plugins::ml2::mech_driver (
$supported_pci_vendor_devs,
){
include ::neutron::deps
include neutron::deps
if ($name == 'sriovnicswitch') {
neutron_plugin_sriov {

4
manifests/plugins/ml2/mellanox.pp

@ -15,8 +15,8 @@ class neutron::plugins::ml2::mellanox (
$package_ensure = 'present'
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
if($::osfamily != 'RedHat') {

2
manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp

@ -51,7 +51,7 @@ class neutron::plugins::ml2::mellanox::mlnx_sdn_assist (
$bind_normal_ports_physnets = [],
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
neutron_plugin_ml2 {

2
manifests/plugins/ml2/midonet.pp

@ -25,7 +25,7 @@ class neutron::plugins::ml2::midonet (
$project_id = 'services',
) {
include ::neutron::deps
include neutron::deps
neutron_plugin_ml2 {
'MIDONET/midonet_uri' : value => $midonet_uri;

4
manifests/plugins/ml2/networking_ansible.pp

@ -36,8 +36,8 @@ class neutron::plugins::ml2::networking_ansible(
$coordination_uri = $::os_service_default,
$package_ensure = 'present'
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if($::osfamily != 'RedHat') {
# Drivers are only packaged for RedHat at this time

2
manifests/plugins/ml2/networking_ansible_host.pp

@ -41,7 +41,7 @@ define neutron::plugins::ml2::networking_ansible_host(
$hostname = $title,
$manage_vlans = undef,
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
if (($ansible_ssh_pass == undef and $ansible_ssh_private_key_file == undef) or

4
manifests/plugins/ml2/networking_baremetal.pp

@ -14,8 +14,8 @@ class neutron::plugins::ml2::networking_baremetal(
$package_ensure = 'present',
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if($::osfamily != 'RedHat') {
# Drivers are only packaged for RedHat at this time

4
manifests/plugins/ml2/nuage.pp

@ -57,8 +57,8 @@ class neutron::plugins::ml2::nuage (
$nuage_default_allow_non_ip = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
file { '/etc/neutron/plugins/nuage':
ensure => directory,

2
manifests/plugins/ml2/opendaylight.pp

@ -54,7 +54,7 @@ class neutron::plugins::ml2::opendaylight (
$odl_features = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
ensure_resource('package', 'python-networking-odl',

2
manifests/plugins/ml2/ovn.pp

@ -123,7 +123,7 @@ class neutron::plugins::ml2::ovn(
$ovn_emit_need_to_frag = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
if ! is_service_default($ovn_l3_mode) {

2
manifests/plugins/ml2/type_driver.pp

@ -52,7 +52,7 @@ define neutron::plugins::ml2::type_driver (
$max_header_size
){
include ::neutron::deps
include neutron::deps
if ($name == 'flat') {
neutron_plugin_ml2 {

2
manifests/plugins/ml2/vpp.pp

@ -26,7 +26,7 @@ class neutron::plugins::ml2::vpp (
$etcd_user = $::os_service_default,
$etcd_pass = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
require ::neutron::plugins::ml2
neutron_plugin_ml2 {

4
manifests/plugins/nsx.pp

@ -81,8 +81,8 @@ class neutron::plugins::nsx (
$metadata_proxy_uuid = undef,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
file { '/etc/neutron/plugins/vmware':
ensure => directory,

4
manifests/plugins/nuage.pp

@ -52,8 +52,8 @@ class neutron::plugins::nuage (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
file { '/etc/neutron/plugins/nuage':
ensure => directory,

4
manifests/plugins/nvp.pp

@ -40,8 +40,8 @@ class neutron::plugins::nvp (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
Package['neutron'] -> Package['neutron-plugin-nvp']

4
manifests/plugins/opencontrail.pp

@ -66,8 +66,8 @@ class neutron::plugins::opencontrail (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
validate_legacy(Array, 'validate_array', $contrail_extensions)

2
manifests/plugins/ovs/bridge.pp

@ -1,7 +1,7 @@
#
define neutron::plugins::ovs::bridge {
include ::neutron::deps
include neutron::deps
$mapping = split($name, ':')
$bridge = $mapping[1]

2
manifests/plugins/ovs/opendaylight.pp

@ -114,7 +114,7 @@ class neutron::plugins::ovs::opendaylight (
$enable_ipv6 = false,
) {
include ::neutron::deps
include neutron::deps
# Handle the case where ODL controller is also on this host
Service<| title == 'opendaylight' |> -> Exec <| title == 'Wait for NetVirt OVSDB to come up' |>

2
manifests/plugins/ovs/port.pp

@ -1,7 +1,7 @@
#
define neutron::plugins::ovs::port {
include ::neutron::deps
include neutron::deps
$mapping = split($name, ':')
vs_port {$mapping[1]:

4
manifests/plugins/plumgrid.pp

@ -121,8 +121,8 @@ class neutron::plugins::plumgrid (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
ensure_resource('file', '/etc/neutron/plugins/plumgrid', {
ensure => directory,

4
manifests/policy.pp

@ -28,8 +28,8 @@ class neutron::policy (
$policy_path = '/etc/neutron/policy.json',
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
validate_legacy(Hash, 'validate_hash', $policies)

2
manifests/quota.pp

@ -111,7 +111,7 @@ class neutron::quota (
$quota_vip = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
neutron_config {
'quotas/default_quota': value => $default_quota;

2
manifests/rootwrap.pp

@ -25,7 +25,7 @@ class neutron::rootwrap (
$xenapi_connection_password = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
neutron_rootwrap_config {
'xenapi/xenapi_connection_url': value => $xenapi_connection_url;

14
manifests/server.pp

@ -294,11 +294,11 @@ class neutron::server (
$ovs_integration_bridge = $::os_service_default,
) inherits ::neutron::params {
include ::neutron::deps
include ::neutron::db
include ::neutron::policy
include neutron::deps
include neutron::db
include neutron::policy
# Work-around LP#1551974. neutron requires the keystoneclient to auth tokens
include ::keystone::client
include keystone::client
if !is_service_default($default_availability_zones) {
validate_legacy(Array, 'validate_array', $default_availability_zones)
@ -367,7 +367,7 @@ class neutron::server (
}
if $sync_db {
include ::neutron::db::sync
include neutron::db::sync
}
neutron_config {
@ -418,7 +418,7 @@ class neutron::server (
if ($auth_strategy == 'keystone') {
include ::neutron::keystone::authtoken
include neutron::keystone::authtoken
neutron_api_config {
'filter:authtoken/admin_tenant_name': ensure => absent;
@ -456,7 +456,7 @@ class neutron::server (
tag => ['neutron-service', 'neutron-db-sync-service', 'neutron-server-eventlet'],
}
} elsif $service_name == 'httpd' {
include ::apache::params
include apache::params
service { 'neutron-server':
ensure => 'stopped',
name => $::neutron::params::server_service,

2
manifests/server/notifications.pp

@ -105,7 +105,7 @@ class neutron::server::notifications (
$endpoint_type = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
if is_service_default($tenant_id) and (! $tenant_name) {
fail('You must provide either tenant_name or tenant_id.')

2
manifests/server/placement.pp

@ -79,7 +79,7 @@ class neutron::server::placement (
$endpoint_type = $::os_service_default,
) {
include ::neutron::deps
include neutron::deps
neutron_config {
'placement/auth_url': value => $auth_url;

4
manifests/services/bgpvpn.pp

@ -44,8 +44,8 @@ class neutron::services::bgpvpn (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
#This package just include the service API
ensure_resource( 'package', $::neutron::params::bgpvpn_plugin_package, {

4
manifests/services/fwaas.pp

@ -54,8 +54,8 @@ class neutron::services::fwaas (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if ($::osfamily == 'Debian') {
# Debian platforms

4
manifests/services/l2gw.pp

@ -53,8 +53,8 @@ class neutron::services::l2gw (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
if !is_service_default($service_providers) {
validate_legacy(Array, 'validate_array', $service_providers)

4
manifests/services/sfc.pp

@ -50,8 +50,8 @@ class neutron::services::sfc (
$purge_config = false,
) {
include ::neutron::deps
include ::neutron::params
include neutron::deps
include neutron::params
ensure_resource( 'package', $::neutron::params::sfc_package, {
ensure => $package_ensure,

2
manifests/services/vpnaas.pp

@ -43,7 +43,7 @@ class neutron::services::vpnaas (
$service_providers = $::os_service_default,
) {
include ::neutron::params
include neutron::params
if !is_service_default($service_providers) {
warning("service_providers in neutron::services::vpnaas is deprecated in newton release, \
please use service provider in neutron::server class")

10
manifests/wsgi/apache.pp

@ -121,12 +121,12 @@ class neutron::wsgi::apache (
$custom_wsgi_process_options = {},
) {
include ::neutron::deps
include ::neutron::params
include ::apache
include ::apache::mod::wsgi
include neutron::deps
include neutron::params
include apache
include apache::mod::wsgi
if $ssl {
include ::apache::mod::ssl
include apache::mod::ssl
}
# The httpd package is untagged, but needs to have ordering enforced,

12
spec/acceptance/basic_neutron_spec.rb

@ -6,12 +6,12 @@ describe 'basic neutron' do
it 'should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
include ::openstack_integration::neutron
include openstack_integration
include openstack_integration::repos
include openstack_integration::rabbitmq
include openstack_integration::mysql
include openstack_integration::keystone
include openstack_integration::neutron
EOS

2
spec/classes/neutron_keystone_auth_spec.rb

@ -35,7 +35,7 @@ describe 'neutron::keystone::auth' do
context 'when configuring neutron-server' do
let :pre_condition do
"class { '::neutron::keystone::authtoken':
"class { 'neutron::keystone::authtoken':
password => 'test',
}