From 94673ed159d82f298c66816fb63bb303bcf0725a Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 8 Dec 2019 23:12:32 +0100 Subject: [PATCH] Convert all class usage to relative names Change-Id: I229428feb1cb4fc7b551d2654328a8f0bb349910 --- README.md | 4 ++-- examples/cisco_ml2.pp | 6 ++--- examples/neutron.pp | 22 +++++++++---------- examples/neutron_l3_with_to_uuid.pp | 6 ++--- examples/neutron_with_pacemaker.pp | 8 +++---- examples/neutron_wsgi.pp | 8 +++---- lib/puppet/provider/neutron.rb | 2 +- manifests/agents/bagpipe.pp | 4 ++-- manifests/agents/bgp_dragent.pp | 4 ++-- manifests/agents/bigswitch.pp | 4 ++-- manifests/agents/dhcp.pp | 4 ++-- manifests/agents/l2gw.pp | 4 ++-- manifests/agents/l3.pp | 4 ++-- manifests/agents/metadata.pp | 4 ++-- manifests/agents/metering.pp | 4 ++-- manifests/agents/ml2/linuxbridge.pp | 4 ++-- manifests/agents/ml2/mlnx.pp | 4 ++-- manifests/agents/ml2/networking_baremetal.pp | 4 ++-- manifests/agents/ml2/ovs.pp | 4 ++-- manifests/agents/ml2/sriov.pp | 4 ++-- manifests/agents/ml2/vpp.pp | 4 ++-- manifests/agents/n1kv_vem.pp | 4 ++-- manifests/agents/ovn_metadata.pp | 4 ++-- manifests/agents/vpnaas.pp | 4 ++-- manifests/client.pp | 4 ++-- manifests/config.pp | 2 +- manifests/db.pp | 2 +- manifests/db/mysql.pp | 2 +- manifests/db/postgresql.pp | 2 +- manifests/db/sync.pp | 4 ++-- manifests/designate.pp | 4 ++-- manifests/init.pp | 4 ++-- manifests/keystone/auth.pp | 2 +- manifests/keystone/authtoken.pp | 2 +- manifests/logging.pp | 2 +- manifests/params.pp | 2 +- manifests/plugins/cisco.pp | 2 +- manifests/plugins/midonet.pp | 4 ++-- manifests/plugins/ml2.pp | 4 ++-- manifests/plugins/ml2/arista.pp | 2 +- manifests/plugins/ml2/arista/l3.pp | 2 +- manifests/plugins/ml2/bagpipe.pp | 4 ++-- manifests/plugins/ml2/bigswitch.pp | 4 ++-- manifests/plugins/ml2/bigswitch/restproxy.pp | 2 +- manifests/plugins/ml2/cisco.pp | 4 ++-- manifests/plugins/ml2/cisco/nexus.pp | 4 ++-- manifests/plugins/ml2/cisco/nexus1000v.pp | 4 ++-- manifests/plugins/ml2/cisco/nexus_creds.pp | 2 +- manifests/plugins/ml2/cisco/nexus_switch.pp | 2 +- .../plugins/ml2/cisco/nexus_switch_server.pp | 2 +- .../plugins/ml2/cisco/type_nexus_vxlan.pp | 4 ++-- manifests/plugins/ml2/cisco/ucsm.pp | 4 ++-- manifests/plugins/ml2/cisco/vts.pp | 2 +- manifests/plugins/ml2/fujitsu.pp | 2 +- manifests/plugins/ml2/mech_driver.pp | 2 +- manifests/plugins/ml2/mellanox.pp | 4 ++-- .../plugins/ml2/mellanox/mlnx_sdn_assist.pp | 2 +- manifests/plugins/ml2/midonet.pp | 2 +- manifests/plugins/ml2/networking_ansible.pp | 4 ++-- .../plugins/ml2/networking_ansible_host.pp | 2 +- manifests/plugins/ml2/networking_baremetal.pp | 4 ++-- manifests/plugins/ml2/nuage.pp | 4 ++-- manifests/plugins/ml2/opendaylight.pp | 2 +- manifests/plugins/ml2/ovn.pp | 2 +- manifests/plugins/ml2/type_driver.pp | 2 +- manifests/plugins/ml2/vpp.pp | 2 +- manifests/plugins/nsx.pp | 4 ++-- manifests/plugins/nuage.pp | 4 ++-- manifests/plugins/nvp.pp | 4 ++-- manifests/plugins/opencontrail.pp | 4 ++-- manifests/plugins/ovs/bridge.pp | 2 +- manifests/plugins/ovs/opendaylight.pp | 2 +- manifests/plugins/ovs/port.pp | 2 +- manifests/plugins/plumgrid.pp | 4 ++-- manifests/policy.pp | 4 ++-- manifests/quota.pp | 2 +- manifests/rootwrap.pp | 2 +- manifests/server.pp | 14 ++++++------ manifests/server/notifications.pp | 2 +- manifests/server/placement.pp | 2 +- manifests/services/bgpvpn.pp | 4 ++-- manifests/services/fwaas.pp | 4 ++-- manifests/services/l2gw.pp | 4 ++-- manifests/services/sfc.pp | 4 ++-- manifests/services/vpnaas.pp | 2 +- manifests/wsgi/apache.pp | 10 ++++----- spec/acceptance/basic_neutron_spec.rb | 12 +++++----- spec/classes/neutron_keystone_auth_spec.rb | 2 +- spec/classes/neutron_plugins_cisco_spec.rb | 2 +- spec/classes/neutron_plugins_midonet_spec.rb | 2 +- .../neutron_plugins_ml2_arista_l3_spec.rb | 2 +- .../neutron_plugins_ml2_arista_spec.rb | 2 +- ...on_plugins_ml2_bigswitch_restproxy_spec.rb | 2 +- .../neutron_plugins_ml2_bigswitch_spec.rb | 2 +- ...utron_plugins_ml2_cisco_nexus1000v_spec.rb | 2 +- .../neutron_plugins_ml2_cisco_nexus_spec.rb | 2 +- .../classes/neutron_plugins_ml2_cisco_spec.rb | 2 +- ...plugins_ml2_cisco_type_nexus_vxlan_spec.rb | 2 +- .../neutron_plugins_ml2_cisco_ucsm_spec.rb | 2 +- .../neutron_plugins_ml2_cisco_vts_spec.rb | 2 +- .../neutron_plugins_ml2_fujitsu_cfab_spec.rb | 2 +- .../neutron_plugins_ml2_fujitsu_fossw_spec.rb | 2 +- .../neutron_plugins_ml2_fujitsu_spec.rb | 2 +- .../neutron_plugins_ml2_mellanox_spec.rb | 2 +- .../neutron_plugins_ml2_midonet_spec.rb | 2 +- ...eutron_plugins_ml2_mlnx_sdn_assist_spec.rb | 2 +- .../classes/neutron_plugins_ml2_nuage_spec.rb | 8 +++---- .../neutron_plugins_ml2_opendaylight_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_ovn_spec.rb | 2 +- spec/classes/neutron_plugins_ml2_vpp_spec.rb | 2 +- spec/classes/neutron_plugins_nsx_spec.rb | 2 +- spec/classes/neutron_plugins_nuage_spec.rb | 2 +- .../neutron_plugins_opencontrail_spec.rb | 2 +- spec/classes/neutron_plugins_plumgrid_spec.rb | 2 +- spec/classes/neutron_server_spec.rb | 6 ++--- spec/classes/neutron_services_fwaas_spec.rb | 2 +- spec/classes/neutron_services_l2gw_spec.rb | 2 +- 117 files changed, 202 insertions(+), 202 deletions(-) diff --git a/README.md b/README.md index 68242b4e8..8b214b386 100644 --- a/README.md +++ b/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', diff --git a/examples/cisco_ml2.pp b/examples/cisco_ml2.pp index 42d7fb3a6..23b6c9636 100644 --- a/examples/cisco_ml2.pp +++ b/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'], diff --git a/examples/neutron.pp b/examples/neutron.pp index 3d54d38eb..925187743 100644 --- a/examples/neutron.pp +++ b/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'] } diff --git a/examples/neutron_l3_with_to_uuid.pp b/examples/neutron_l3_with_to_uuid.pp index 42335e113..41a20492c 100644 --- a/examples/neutron_l3_with_to_uuid.pp +++ b/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'], diff --git a/examples/neutron_with_pacemaker.pp b/examples/neutron_with_pacemaker.pp index ef48db862..71d8672f7 100644 --- a/examples/neutron_with_pacemaker.pp +++ b/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, } diff --git a/examples/neutron_wsgi.pp b/examples/neutron_wsgi.pp index a5a3ef2b1..6f8885335 100644 --- a/examples/neutron_wsgi.pp +++ b/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, } diff --git a/lib/puppet/provider/neutron.rb b/lib/puppet/provider/neutron.rb index 62070e0e9..6688e5ffd 100644 --- a/lib/puppet/provider/neutron.rb +++ b/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 ::. This should be + # format for the tenant to include . 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}" diff --git a/manifests/agents/bagpipe.pp b/manifests/agents/bagpipe.pp index d2ed6382c..cc3789b13 100644 --- a/manifests/agents/bagpipe.pp +++ b/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, diff --git a/manifests/agents/bgp_dragent.pp b/manifests/agents/bgp_dragent.pp index 9c62a5f33..aee9e75ea 100644 --- a/manifests/agents/bgp_dragent.pp +++ b/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, diff --git a/manifests/agents/bigswitch.pp b/manifests/agents/bigswitch.pp index 40faccac5..ae198cdcc 100644 --- a/manifests/agents/bigswitch.pp +++ b/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}") diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index 4b33e1579..1dd6b019e 100644 --- a/manifests/agents/dhcp.pp +++ b/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.') diff --git a/manifests/agents/l2gw.pp b/manifests/agents/l2gw.pp index 3c32bba63..0bfe148f7 100644 --- a/manifests/agents/l2gw.pp +++ b/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, diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index 10e68b3f0..0a034dea7 100644 --- a/manifests/agents/l3.pp +++ b/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, diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp index df5269d52..2d5e77066 100644 --- a/manifests/agents/metadata.pp +++ b/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, diff --git a/manifests/agents/metering.pp b/manifests/agents/metering.pp index e0c28fe7e..8de8afc97 100644 --- a/manifests/agents/metering.pp +++ b/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, diff --git a/manifests/agents/ml2/linuxbridge.pp b/manifests/agents/ml2/linuxbridge.pp index 118f4ca02..7e17e95e4 100644 --- a/manifests/agents/ml2/linuxbridge.pp +++ b/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, diff --git a/manifests/agents/ml2/mlnx.pp b/manifests/agents/ml2/mlnx.pp index 134382b5c..420891794 100644 --- a/manifests/agents/ml2/mlnx.pp +++ b/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 diff --git a/manifests/agents/ml2/networking_baremetal.pp b/manifests/agents/ml2/networking_baremetal.pp index 532214c55..f81bbb2a2 100644 --- a/manifests/agents/ml2/networking_baremetal.pp +++ b/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 diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index d8c3b9896..7c3c180f5 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/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') diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp index f4138155b..c32ca8b49 100644 --- a/manifests/agents/ml2/sriov.pp +++ b/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, diff --git a/manifests/agents/ml2/vpp.pp b/manifests/agents/ml2/vpp.pp index f8204024e..abb04d0c9 100644 --- a/manifests/agents/ml2/vpp.pp +++ b/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, diff --git a/manifests/agents/n1kv_vem.pp b/manifests/agents/n1kv_vem.pp index 0901640e1..78009e8a1 100644 --- a/manifests/agents/n1kv_vem.pp +++ b/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/' ] } diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp index 5343536ed..353bf9ad5 100644 --- a/manifests/agents/ovn_metadata.pp +++ b/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, diff --git a/manifests/agents/vpnaas.pp b/manifests/agents/vpnaas.pp index a3f663575..b6d58fac4 100644 --- a/manifests/agents/vpnaas.pp +++ b/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/: { diff --git a/manifests/client.pp b/manifests/client.pp index cd559c284..b51ad5745 100644 --- a/manifests/client.pp +++ b/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, diff --git a/manifests/config.pp b/manifests/config.pp index 7b3cc4e7c..e997669e1 100644 --- a/manifests/config.pp +++ b/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) diff --git a/manifests/db.pp b/manifests/db.pp index 2666cd6dd..38ca358a1 100644 --- a/manifests/db.pp +++ b/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 \ diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index caf0f13d8..41054f315 100644 --- a/manifests/db/mysql.pp +++ b/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) diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 1580dd0d4..c375c6e9b 100644 --- a/manifests/db/postgresql.pp +++ b/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), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index cc663ab98..415124e9d 100644 --- a/manifests/db/sync.pp +++ b/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", diff --git a/manifests/designate.pp b/manifests/designate.pp index 54347e3f5..30c38c908 100644 --- a/manifests/designate.pp +++ b/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'; diff --git a/manifests/init.pp b/manifests/init.pp index 508faa41d..3ba4173ca 100644 --- a/manifests/init.pp +++ b/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) { diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 0104bf828..8d3a48db9 100644 --- a/manifests/keystone/auth.pp +++ b/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' |> diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 2fa12a7aa..3bdc3a9ad 100644 --- a/manifests/keystone/authtoken.pp +++ b/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') diff --git a/manifests/logging.pp b/manifests/logging.pp index b6be2644b..9c2b13276 100644 --- a/manifests/logging.pp +++ b/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, diff --git a/manifests/params.pp b/manifests/params.pp index 997bdea2b..ded5bc6c9 100644 --- a/manifests/params.pp +++ b/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" diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp index bd648a566..1c94809ea 100644 --- a/manifests/plugins/cisco.pp +++ b/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, diff --git a/manifests/plugins/midonet.pp b/manifests/plugins/midonet.pp index 7255d8afc..d212c7993 100644 --- a/manifests/plugins/midonet.pp +++ b/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. diff --git a/manifests/plugins/ml2.pp b/manifests/plugins/ml2.pp index e58d0fc47..a132c1883 100644 --- a/manifests/plugins/ml2.pp +++ b/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') diff --git a/manifests/plugins/ml2/arista.pp b/manifests/plugins/ml2/arista.pp index 36188beda..3e2994fb7 100644 --- a/manifests/plugins/ml2/arista.pp +++ b/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 { diff --git a/manifests/plugins/ml2/arista/l3.pp b/manifests/plugins/ml2/arista/l3.pp index 9bc894c3c..33bfb8a21 100644 --- a/manifests/plugins/ml2/arista/l3.pp +++ b/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) { diff --git a/manifests/plugins/ml2/bagpipe.pp b/manifests/plugins/ml2/bagpipe.pp index b7954fc6e..a0fcc6b71 100644 --- a/manifests/plugins/ml2/bagpipe.pp +++ b/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 { diff --git a/manifests/plugins/ml2/bigswitch.pp b/manifests/plugins/ml2/bigswitch.pp index c285f5c0f..3f06303c6 100644 --- a/manifests/plugins/ml2/bigswitch.pp +++ b/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') { diff --git a/manifests/plugins/ml2/bigswitch/restproxy.pp b/manifests/plugins/ml2/bigswitch/restproxy.pp index 43f88a1e0..eba5aa8cd 100644 --- a/manifests/plugins/ml2/bigswitch/restproxy.pp +++ b/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 { diff --git a/manifests/plugins/ml2/cisco.pp b/manifests/plugins/ml2/cisco.pp index 00b55dd9c..0f27664ac 100644 --- a/manifests/plugins/ml2/cisco.pp +++ b/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') { diff --git a/manifests/plugins/ml2/cisco/nexus.pp b/manifests/plugins/ml2/cisco/nexus.pp index 9a2dcfb06..aec53814d 100644 --- a/manifests/plugins/ml2/cisco/nexus.pp +++ b/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; diff --git a/manifests/plugins/ml2/cisco/nexus1000v.pp b/manifests/plugins/ml2/cisco/nexus1000v.pp index a9b15ef0f..2fbab328d 100644 --- a/manifests/plugins/ml2/cisco/nexus1000v.pp +++ b/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; diff --git a/manifests/plugins/ml2/cisco/nexus_creds.pp b/manifests/plugins/ml2/cisco/nexus_creds.pp index b0fa232fd..b6d740c5d 100644 --- a/manifests/plugins/ml2/cisco/nexus_creds.pp +++ b/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', { diff --git a/manifests/plugins/ml2/cisco/nexus_switch.pp b/manifests/plugins/ml2/cisco/nexus_switch.pp index b4a3ab5f1..39ec86d7c 100644 --- a/manifests/plugins/ml2/cisco/nexus_switch.pp +++ b/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') diff --git a/manifests/plugins/ml2/cisco/nexus_switch_server.pp b/manifests/plugins/ml2/cisco/nexus_switch_server.pp index dec983219..3bd73374e 100644 --- a/manifests/plugins/ml2/cisco/nexus_switch_server.pp +++ b/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 { diff --git a/manifests/plugins/ml2/cisco/type_nexus_vxlan.pp b/manifests/plugins/ml2/cisco/type_nexus_vxlan.pp index e404cf874..b317adf9c 100644 --- a/manifests/plugins/ml2/cisco/type_nexus_vxlan.pp +++ b/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; diff --git a/manifests/plugins/ml2/cisco/ucsm.pp b/manifests/plugins/ml2/cisco/ucsm.pp index 596ada6d3..1ebe7a6d4 100644 --- a/manifests/plugins/ml2/cisco/ucsm.pp +++ b/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; diff --git a/manifests/plugins/ml2/cisco/vts.pp b/manifests/plugins/ml2/cisco/vts.pp index 8adcc1359..e927cbabe 100644 --- a/manifests/plugins/ml2/cisco/vts.pp +++ b/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', diff --git a/manifests/plugins/ml2/fujitsu.pp b/manifests/plugins/ml2/fujitsu.pp index a9fd6573f..aea2b4ad2 100644 --- a/manifests/plugins/ml2/fujitsu.pp +++ b/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', { diff --git a/manifests/plugins/ml2/mech_driver.pp b/manifests/plugins/ml2/mech_driver.pp index 5a9ee7ded..0eab19ec6 100644 --- a/manifests/plugins/ml2/mech_driver.pp +++ b/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 { diff --git a/manifests/plugins/ml2/mellanox.pp b/manifests/plugins/ml2/mellanox.pp index 62113ff0b..131345434 100644 --- a/manifests/plugins/ml2/mellanox.pp +++ b/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') { diff --git a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp b/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp index d48b2a83e..52c3b3873 100644 --- a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp +++ b/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 { diff --git a/manifests/plugins/ml2/midonet.pp b/manifests/plugins/ml2/midonet.pp index dad8582ee..ffe30578d 100644 --- a/manifests/plugins/ml2/midonet.pp +++ b/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; diff --git a/manifests/plugins/ml2/networking_ansible.pp b/manifests/plugins/ml2/networking_ansible.pp index 7c165f417..81515c483 100644 --- a/manifests/plugins/ml2/networking_ansible.pp +++ b/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 diff --git a/manifests/plugins/ml2/networking_ansible_host.pp b/manifests/plugins/ml2/networking_ansible_host.pp index 934b0181f..d028f8648 100644 --- a/manifests/plugins/ml2/networking_ansible_host.pp +++ b/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 diff --git a/manifests/plugins/ml2/networking_baremetal.pp b/manifests/plugins/ml2/networking_baremetal.pp index 364bb7ceb..b4f7804fa 100644 --- a/manifests/plugins/ml2/networking_baremetal.pp +++ b/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 diff --git a/manifests/plugins/ml2/nuage.pp b/manifests/plugins/ml2/nuage.pp index 6316ee177..7b690fa01 100644 --- a/manifests/plugins/ml2/nuage.pp +++ b/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, diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp index 6e706d329..e08847a58 100644 --- a/manifests/plugins/ml2/opendaylight.pp +++ b/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', diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp index c4c560127..9fcec9bf1 100644 --- a/manifests/plugins/ml2/ovn.pp +++ b/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) { diff --git a/manifests/plugins/ml2/type_driver.pp b/manifests/plugins/ml2/type_driver.pp index ca1d2aed7..1a5081403 100644 --- a/manifests/plugins/ml2/type_driver.pp +++ b/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 { diff --git a/manifests/plugins/ml2/vpp.pp b/manifests/plugins/ml2/vpp.pp index 0410a43ea..65d4a4efb 100644 --- a/manifests/plugins/ml2/vpp.pp +++ b/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 { diff --git a/manifests/plugins/nsx.pp b/manifests/plugins/nsx.pp index 40e1b9268..f7b86fc64 100644 --- a/manifests/plugins/nsx.pp +++ b/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, diff --git a/manifests/plugins/nuage.pp b/manifests/plugins/nuage.pp index 8a188c66d..16963912c 100644 --- a/manifests/plugins/nuage.pp +++ b/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, diff --git a/manifests/plugins/nvp.pp b/manifests/plugins/nvp.pp index cf5c75129..0d7df5a71 100644 --- a/manifests/plugins/nvp.pp +++ b/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'] diff --git a/manifests/plugins/opencontrail.pp b/manifests/plugins/opencontrail.pp index d745e0395..81108484f 100644 --- a/manifests/plugins/opencontrail.pp +++ b/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) diff --git a/manifests/plugins/ovs/bridge.pp b/manifests/plugins/ovs/bridge.pp index 4cb497e64..ef6b41bb3 100644 --- a/manifests/plugins/ovs/bridge.pp +++ b/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] diff --git a/manifests/plugins/ovs/opendaylight.pp b/manifests/plugins/ovs/opendaylight.pp index ceef7cf6e..10e2d1faf 100644 --- a/manifests/plugins/ovs/opendaylight.pp +++ b/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' |> diff --git a/manifests/plugins/ovs/port.pp b/manifests/plugins/ovs/port.pp index 296029197..b7ef951aa 100644 --- a/manifests/plugins/ovs/port.pp +++ b/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]: diff --git a/manifests/plugins/plumgrid.pp b/manifests/plugins/plumgrid.pp index 6facc424b..26997715b 100644 --- a/manifests/plugins/plumgrid.pp +++ b/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, diff --git a/manifests/policy.pp b/manifests/policy.pp index 2c9985f6c..85091c087 100644 --- a/manifests/policy.pp +++ b/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) diff --git a/manifests/quota.pp b/manifests/quota.pp index f2f849aaf..2dd289483 100644 --- a/manifests/quota.pp +++ b/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; diff --git a/manifests/rootwrap.pp b/manifests/rootwrap.pp index b9d82ecf9..910725046 100644 --- a/manifests/rootwrap.pp +++ b/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; diff --git a/manifests/server.pp b/manifests/server.pp index df045177a..2f4181d5b 100644 --- a/manifests/server.pp +++ b/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, diff --git a/manifests/server/notifications.pp b/manifests/server/notifications.pp index d94f7ecfa..d47ead4b9 100644 --- a/manifests/server/notifications.pp +++ b/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.') diff --git a/manifests/server/placement.pp b/manifests/server/placement.pp index 59109d42a..236abcba9 100644 --- a/manifests/server/placement.pp +++ b/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; diff --git a/manifests/services/bgpvpn.pp b/manifests/services/bgpvpn.pp index f3df69ced..19eaf8ef5 100644 --- a/manifests/services/bgpvpn.pp +++ b/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, { diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp index a5cd78eff..e6b9d5d8f 100644 --- a/manifests/services/fwaas.pp +++ b/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 diff --git a/manifests/services/l2gw.pp b/manifests/services/l2gw.pp index 122604dbf..f2e33892a 100644 --- a/manifests/services/l2gw.pp +++ b/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) diff --git a/manifests/services/sfc.pp b/manifests/services/sfc.pp index c2ea49abc..112fbc4ee 100644 --- a/manifests/services/sfc.pp +++ b/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, diff --git a/manifests/services/vpnaas.pp b/manifests/services/vpnaas.pp index e22088d95..872dfb869 100644 --- a/manifests/services/vpnaas.pp +++ b/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") diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 4c010d1c8..793fb6781 100644 --- a/manifests/wsgi/apache.pp +++ b/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, diff --git a/spec/acceptance/basic_neutron_spec.rb b/spec/acceptance/basic_neutron_spec.rb index ce0c5528f..2e0068377 100644 --- a/spec/acceptance/basic_neutron_spec.rb +++ b/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 diff --git a/spec/classes/neutron_keystone_auth_spec.rb b/spec/classes/neutron_keystone_auth_spec.rb index 2928f71a7..bec2f3353 100644 --- a/spec/classes/neutron_keystone_auth_spec.rb +++ b/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', } class { 'neutron::server': }" diff --git a/spec/classes/neutron_plugins_cisco_spec.rb b/spec/classes/neutron_plugins_cisco_spec.rb index 0f506ae61..59fd76aaf 100644 --- a/spec/classes/neutron_plugins_cisco_spec.rb +++ b/spec/classes/neutron_plugins_cisco_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::cisco' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_midonet_spec.rb b/spec/classes/neutron_plugins_midonet_spec.rb index d2fe354ee..e4a8c0ad3 100644 --- a/spec/classes/neutron_plugins_midonet_spec.rb +++ b/spec/classes/neutron_plugins_midonet_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::midonet' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb b/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb index 3188a12c3..13d89d806 100644 --- a/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb +++ b/spec/classes/neutron_plugins_ml2_arista_l3_spec.rb @@ -21,7 +21,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::arista::l3' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_arista_spec.rb b/spec/classes/neutron_plugins_ml2_arista_spec.rb index 5fb7dc2c1..5c6e13a1d 100644 --- a/spec/classes/neutron_plugins_ml2_arista_spec.rb +++ b/spec/classes/neutron_plugins_ml2_arista_spec.rb @@ -21,7 +21,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::arista' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb index bfef550fc..d51a9e72a 100644 --- a/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb +++ b/spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::bigswitch::restproxy' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb index a5c038a00..c6397a56e 100644 --- a/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb +++ b/spec/classes/neutron_plugins_ml2_bigswitch_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::bigswitch' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb index 82a06229b..c9418b9a7 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::cisco::nexus1000v' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb index 376589751..1eae2751d 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::cisco::nexus' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_cisco_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_spec.rb index ac767fbb1..e78c6ddae 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::cisco' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb index 3f6faa693..df8ee9162 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb index f52698d14..8dd4de995 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::cisco::ucsm' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb b/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb index f0c9d0735..6fccf8362 100644 --- a/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb +++ b/spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::cisco::vts' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb b/spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb index eef9f3060..f912f5c85 100644 --- a/spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb +++ b/spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::fujitsu::cfab' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb b/spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb index 7c220d2ca..3ffcf4b3b 100644 --- a/spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb +++ b/spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::fujitsu::fossw' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb b/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb index 8094804d8..cd0421aa4 100644 --- a/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb +++ b/spec/classes/neutron_plugins_ml2_fujitsu_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::fujitsu' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_mellanox_spec.rb b/spec/classes/neutron_plugins_ml2_mellanox_spec.rb index 3e968eaa6..e1db0ca0e 100644 --- a/spec/classes/neutron_plugins_ml2_mellanox_spec.rb +++ b/spec/classes/neutron_plugins_ml2_mellanox_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::mellanox' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_midonet_spec.rb b/spec/classes/neutron_plugins_ml2_midonet_spec.rb index 5e95df16d..ae2c488ae 100644 --- a/spec/classes/neutron_plugins_ml2_midonet_spec.rb +++ b/spec/classes/neutron_plugins_ml2_midonet_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::midonet' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb b/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb index e0182a104..121f18172 100644 --- a/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb +++ b/spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::mellanox::mlnx_sdn_assist' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_nuage_spec.rb b/spec/classes/neutron_plugins_ml2_nuage_spec.rb index 63384be97..3c11b8a90 100644 --- a/spec/classes/neutron_plugins_ml2_nuage_spec.rb +++ b/spec/classes/neutron_plugins_ml2_nuage_spec.rb @@ -2,13 +2,13 @@ require 'spec_helper' describe 'neutron::plugins::ml2::nuage' do let :pre_condition do - "class { '::neutron': + "class { 'neutron': core_plugin => 'ml2' } - class { '::neutron::keystone::authtoken': + class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } - class { '::neutron::plugins::ml2': + class { 'neutron::plugins::ml2': mechanism_drivers => ['nuage'] }" end @@ -83,7 +83,7 @@ describe 'neutron::plugins::ml2::nuage' do context 'configure ml2 nuage with wrong mechanism_driver configuration' do let :pre_condition do - "class { '::neutron::plugins::ml2': + "class { 'neutron::plugins::ml2': mechanism_drivers => ['bar'] }" end diff --git a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb index e53d567bd..10862119c 100644 --- a/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb +++ b/spec/classes/neutron_plugins_ml2_opendaylight_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::opendaylight' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_ovn_spec.rb b/spec/classes/neutron_plugins_ml2_ovn_spec.rb index 8303b8753..e6d3668c5 100644 --- a/spec/classes/neutron_plugins_ml2_ovn_spec.rb +++ b/spec/classes/neutron_plugins_ml2_ovn_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::ovn' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_ml2_vpp_spec.rb b/spec/classes/neutron_plugins_ml2_vpp_spec.rb index e96c4be46..dfb064bbf 100644 --- a/spec/classes/neutron_plugins_ml2_vpp_spec.rb +++ b/spec/classes/neutron_plugins_ml2_vpp_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::ml2::vpp' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_nsx_spec.rb b/spec/classes/neutron_plugins_nsx_spec.rb index c3ad1f721..646fa128a 100644 --- a/spec/classes/neutron_plugins_nsx_spec.rb +++ b/spec/classes/neutron_plugins_nsx_spec.rb @@ -4,7 +4,7 @@ describe 'neutron::plugins::nsx' do let :pre_condition do "class { 'neutron': core_plugin => 'vmware_nsx.plugin.NsxV3Plugin' } - class { '::neutron::keystone::authtoken': + class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': }" diff --git a/spec/classes/neutron_plugins_nuage_spec.rb b/spec/classes/neutron_plugins_nuage_spec.rb index d028c51fc..4eae3da08 100644 --- a/spec/classes/neutron_plugins_nuage_spec.rb +++ b/spec/classes/neutron_plugins_nuage_spec.rb @@ -4,7 +4,7 @@ describe 'neutron::plugins::nuage' do let :pre_condition do "class { 'neutron': core_plugin => 'nuage_neutron.plugins.nuage.plugin.NuagePlugin' } - class { '::neutron::keystone::authtoken': + class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': }" diff --git a/spec/classes/neutron_plugins_opencontrail_spec.rb b/spec/classes/neutron_plugins_opencontrail_spec.rb index d6b4f32f4..bc41dcc0e 100644 --- a/spec/classes/neutron_plugins_opencontrail_spec.rb +++ b/spec/classes/neutron_plugins_opencontrail_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::opencontrail' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_plugins_plumgrid_spec.rb b/spec/classes/neutron_plugins_plumgrid_spec.rb index c97469fcc..e887c6bda 100644 --- a/spec/classes/neutron_plugins_plumgrid_spec.rb +++ b/spec/classes/neutron_plugins_plumgrid_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'neutron::plugins::plumgrid' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': } diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb index 6a36a773f..668b76efb 100644 --- a/spec/classes/neutron_server_spec.rb +++ b/spec/classes/neutron_server_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'neutron::server' do let :pre_condition do "class { 'neutron': } - class { '::neutron::keystone::authtoken': + class { 'neutron::keystone::authtoken': password => 'passw0rd', }" end @@ -229,8 +229,8 @@ describe 'neutron::server' do let :pre_condition do "class { 'neutron': } - include ::apache - class { '::neutron::keystone::authtoken': + include apache + class { 'neutron::keystone::authtoken': password => 'passw0rd', }" end diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb index 5957b9ce0..b9c019c8b 100644 --- a/spec/classes/neutron_services_fwaas_spec.rb +++ b/spec/classes/neutron_services_fwaas_spec.rb @@ -23,7 +23,7 @@ require 'spec_helper' describe 'neutron::services::fwaas' do let :pre_condition do "class { 'neutron': } - include ::neutron::agents::l3" + include neutron::agents::l3" end let :params do diff --git a/spec/classes/neutron_services_l2gw_spec.rb b/spec/classes/neutron_services_l2gw_spec.rb index a21afeb1d..98ef92d8e 100644 --- a/spec/classes/neutron_services_l2gw_spec.rb +++ b/spec/classes/neutron_services_l2gw_spec.rb @@ -18,7 +18,7 @@ require 'spec_helper' describe 'neutron::services::l2gw' do let :pre_condition do - "class { '::neutron::keystone::authtoken': + "class { 'neutron::keystone::authtoken': password => 'passw0rd', } class { 'neutron::server': }