Merge "Validate ensure parameter for package resources"

manifests/agents/bagpipe.pp

@@ -21,6 +21,18 @@
 #
 # === Parameters
 #
+# [*package_ensure*]
+#   (optional) The state of the package
+#   Defaults to present
+#
+# [*enabled*]
+#   (optional) The state of the service
+#   Defaults to true
+#
+# [*manage_service*]
+#   (optional) Whether to start/stop the service
+#   Defaults to true
+#
 # [*my_as*]
 #   (required) Private Autonomous System number
 #   Defaults to $facts['os_service_default']
@@ -37,18 +49,10 @@
 #   IP VPN dataplane driver class
 #   Default to ovs
 #
-# [*enabled*]
-#   (optional) The state of the service
-#   Defaults to true
-#
 # [*enable_rtc*]
 #   Enable Route Target Constraint
 #   Defaults to $facts['os_service_default']
 #
-# [*manage_service*]
-#   (optional) Whether to start/stop the service
-#   Defaults to true
-#
 # [*mpls_interface*]
 #   MPLS outgoing interface for Linux and OVS drivers
 #   Defaults to $facts['os_service_default']
@@ -57,10 +61,6 @@
 #   OVS bridge to use
 #   Defaults to $facts['os_service_default']
 #
-# [*package_ensure*]
-#   (optional) The state of the package
-#   Defaults to present
-#
 # [*peers*]
 #   List of peers' IPs to establish p2p connections
 #   Defaults to $facts['os_service_default']
@@ -69,30 +69,30 @@
 #   For OVS driver control if VRF will reply ARP messages
 #   Defaults to false
 #
+# [*local_address*]
+#   (required) Local IP of the server to carry BGP traffic
+#   Defaults to $facts['networking']['ip']
+#
 # [*purge_config*]
 #   (optional) Whether to set only the specified config options
 #   in the l2gateway config.
 #   Default to false.
 #
-# [*local_address*]
-#   (required) Local IP of the server to carry BGP traffic
-#   Defaults to $facts['networking']['ip']
-#
 class neutron::agents::bagpipe (
   $my_as,
+  Stdlib::Ensure::Package $package_ensure = 'present',
+  Boolean $enabled                        = true,
+  Boolean $manage_service                 = true,
   $api_host                               = $facts['os_service_default'],
   $api_port                               = $facts['os_service_default'],
   $dataplane_driver_ipvpn                 = 'ovs',
-  Boolean $enabled         = true,
   $enable_rtc                             = $facts['os_service_default'],
-  Boolean $manage_service  = true,
   $mpls_interface                         = $facts['os_service_default'],
   $ovs_bridge                             = $facts['os_service_default'],
-  $package_ensure          = 'present',
   $peers                                  = $facts['os_service_default'],
   $proxy_arp                              = false,
-  Boolean $purge_config    = false,
   $local_address                          = $facts['networking']['ip'],
+  Boolean $purge_config                   = false,
 ) {
   include neutron::deps
   include neutron::params

manifests/agents/bgp_dragent.pp

@@ -46,7 +46,7 @@
 #   Defaults to false
 #
 class neutron::agents::bgp_dragent (
-  $package_ensure         = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $bgp_speaker_driver                     = 'neutron_dynamic_routing.services.bgp.agent.driver.os_ken.driver.OsKenBgpDriver',

manifests/agents/dhcp.pp

@@ -131,7 +131,7 @@
 #   Defaults to $facts['os_service_default']
 #
 class neutron::agents::dhcp (
-  $package_ensure                   = present,
+  Stdlib::Ensure::Package $package_ensure = present,
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $debug                                  = $facts['os_service_default'],

manifests/agents/fwaas.pp

@@ -29,7 +29,7 @@
 #   Defaults to false.
 #
 class neutron::agents::fwaas (
-  $package_ensure       = present,
+  Stdlib::Ensure::Package $package_ensure = present,
   $driver                                 = $facts['os_service_default'],
   $enabled                                = $facts['os_service_default'],
   $conntrack_driver                       = $facts['os_service_default'],

manifests/agents/l2gw.pp

@@ -64,7 +64,7 @@
 #   Default to false.
 #
 class neutron::agents::l2gw (
-  $package_ensure                   = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $debug                                  = $facts['os_service_default'],

manifests/agents/l3.pp

@@ -178,7 +178,7 @@
 #   Defaults to false.
 #
 class neutron::agents::l3 (
-  $package_ensure                            = 'present',
+  Stdlib::Ensure::Package $package_ensure    = 'present',
   Boolean $enabled                           = true,
   Boolean $manage_service                    = true,
   $debug                                     = $facts['os_service_default'],

manifests/agents/metadata.pp

@@ -78,7 +78,7 @@
 #
 class neutron::agents::metadata (
   $shared_secret,
-  $package_ensure           = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $debug                                  = $facts['os_service_default'],

manifests/agents/metering.pp

@@ -66,7 +66,7 @@
 #   Defaults to false.
 #
 class neutron::agents::metering (
-  $package_ensure           = present,
+  Stdlib::Ensure::Package $package_ensure = present,
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $debug                                  = $facts['os_service_default'],

manifests/agents/ml2/macvtap.pp

@@ -32,7 +32,7 @@
 #   Defaults to false.
 #
 class neutron::agents::ml2::macvtap (
-  $package_ensure                      = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $polling_interval                       = $facts['os_service_default'],

manifests/agents/ml2/networking_baremetal.pp

@@ -104,7 +104,7 @@ class neutron::agents::ml2::networking_baremetal (
   $password,
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
-  $package_ensure          = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $endpoint_override                      = $facts['os_service_default'],
   $cafile                                 = $facts['os_service_default'],
   $certfile                               = $facts['os_service_default'],

manifests/agents/ml2/ovn.pp

@@ -105,7 +105,7 @@
 #   Defaults to false.
 #
 class neutron::agents::ml2::ovn (
-  $package_ensure           = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $debug                                  = $facts['os_service_default'],

manifests/agents/ml2/ovs.pp

@@ -279,7 +279,7 @@
 #   Defaults to $facts['os_service_default'].
 #
 class neutron::agents::ml2::ovs (
-  $package_ensure                       = 'present',
+  Stdlib::Ensure::Package $package_ensure                 = 'present',
   Boolean $enabled                                        = true,
   Boolean $manage_service                                 = true,
   $extensions                                             = $facts['os_service_default'],
@@ -322,15 +322,12 @@ class neutron::agents::ml2::ovs (
   $igmp_flood_reports                                     = $facts['os_service_default'],
   $igmp_flood_unregistered                                = $facts['os_service_default'],
   $resource_provider_bandwidths                           = [],
-  $resource_provider_packet_processing_without_direction
-                                        = [],
-  $resource_provider_packet_processing_with_direction
-                                        = [],
+  $resource_provider_packet_processing_without_direction  = [],
+  $resource_provider_packet_processing_with_direction     = [],
   $resource_provider_hypervisors                          = [],
   $resource_provider_default_hypervisor                   = $facts['os_service_default'],
   $resource_provider_inventory_defaults                   = {},
-  $resource_provider_packet_processing_inventory_defaults
-                                        = {},
+  $resource_provider_packet_processing_inventory_defaults = {},
   $explicitly_egress_direct                               = $facts['os_service_default'],
   $network_log_rate_limit                                 = $facts['os_service_default'],
   $network_log_burst_limit                                = $facts['os_service_default'],

manifests/agents/ml2/sriov.pp

@@ -98,7 +98,7 @@
 #   Defaults to empty hash
 #
 class neutron::agents::ml2::sriov (
-  $package_ensure                       = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $physical_device_mappings               = $facts['os_service_default'],

manifests/agents/ovn_metadata.pp

@@ -122,7 +122,7 @@
 #
 class neutron::agents::ovn_metadata (
   $shared_secret,
-  $package_ensure            = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $debug                                  = $facts['os_service_default'],

manifests/agents/taas.pp

@@ -24,7 +24,7 @@
 #   Defaults to $facts['os_service_default'].
 #
 class neutron::agents::taas (
-  $package_ensure               = present,
+  Stdlib::Ensure::Package $package_ensure = present,
   $taas_agent_periodic_interval           = $facts['os_service_default'],
 ) {
   include neutron::deps

manifests/agents/vpnaas.pp

@@ -41,7 +41,7 @@
 #   Defaults to false.
 #
 class neutron::agents::vpnaas (
-  $package_ensure              = present,
+  Stdlib::Ensure::Package $package_ensure = present,
   $vpn_device_driver                      = 'neutron_vpnaas.services.vpn.device_drivers.ipsec.OpenSwanDriver',
   $interface_driver                       = 'neutron.agent.linux.interface.OVSInterfaceDriver',
   $ipsec_status_check_interval            = $facts['os_service_default'],

manifests/agents/vpnaas/ovn.pp

@@ -79,7 +79,7 @@
 #   Defaults to $facts['os_service_default'].
 #
 class neutron::agents::vpnaas::ovn (
-  $package_ensure              = present,
+  Stdlib::Ensure::Package $package_ensure = present,
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $debug                                  = $facts['os_service_default'],

manifests/client.pp

@@ -9,7 +9,7 @@
 #   Defaults to present
 #
 class neutron::client (
-  $package_ensure = present
+  Stdlib::Ensure::Package $package_ensure = present
 ) {
   include neutron::deps
   include neutron::params

manifests/init.pp

@@ -292,7 +292,7 @@
 #   Defaults to undef.
 #
 class neutron (
-  $package_ensure                       = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $bind_host                              = $facts['os_service_default'],
   $bind_port                              = $facts['os_service_default'],
   $core_plugin                            = 'ml2',

manifests/plugins/ml2.pp

@@ -22,6 +22,10 @@
 #
 # === Parameters
 #
+# [*package_ensure*]
+#   (optional) Ensure state for package.
+#   Defaults to 'present'.
+#
 # [*type_drivers*]
 #   (optional) List of network type driver entrypoints to be loaded
 #   from the neutron.ml2.type_drivers namespace.
@@ -92,10 +96,6 @@
 #   It should be false when you use nova security group.
 #   Defaults to $facts['os_service_default'].
 #
-# [*package_ensure*]
-#   (optional) Ensure state for package.
-#   Defaults to 'present'.
-#
 # [*physical_network_mtus*]
 #   (optional) For L2 mechanism drivers, per-physical network MTU setting.
 #   Should be an array with 'physnetX1:9000'.
@@ -107,11 +107,6 @@
 #   encapsulated traffic is sent.
 #   Defaults to $facts['os_service_default'].
 #
-# [*purge_config*]
-#   (optional) Whether to set only the specified config options
-#   in the ml2 config.
-#   Defaults to false.
-#
 # [*max_header_size*]
 #   (optional) Geneve encapsulation header size is dynamic, this value is used to calculate
 #   the maximum MTU for the driver.
@@ -122,7 +117,13 @@
 #   are 4 and 6.
 #   Defaults to $facts['os_service_default']
 #
+# [*purge_config*]
+#   (optional) Whether to set only the specified config options
+#   in the ml2 config.
+#   Defaults to false.
+#
 class neutron::plugins::ml2 (
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $type_drivers                           = ['local', 'flat', 'vlan', 'gre', 'vxlan', 'geneve'],
   $extension_drivers                      = $facts['os_service_default'],
   $tenant_network_types                   = ['local', 'flat', 'vlan', 'gre', 'vxlan'],
@@ -133,12 +134,11 @@ class neutron::plugins::ml2 (
   $vxlan_group                            = '224.0.0.1',
   $vni_ranges                             = '10:100',
   $enable_security_group                  = $facts['os_service_default'],
-  $package_ensure            = 'present',
   $physical_network_mtus                  = $facts['os_service_default'],
   $path_mtu                               = $facts['os_service_default'],
-  Boolean $purge_config      = false,
   $max_header_size                        = $facts['os_service_default'],
   $overlay_ip_version                     = $facts['os_service_default'],
+  Boolean $purge_config                   = false,
 ) {
   include neutron::deps
   include neutron::params

manifests/plugins/ml2/arista.pp

@@ -60,7 +60,7 @@ class neutron::plugins::ml2::arista (
   $sync_interval  = $facts['os_service_default'],
   $conn_timeout   = $facts['os_service_default'],
   $use_fqdn       = $facts['os_service_default'],
-  $package_ensure = 'present'
+  Stdlib::Ensure::Package $package_ensure = 'present'
 ) {
   include neutron::deps
   include neutron::params

manifests/plugins/ml2/bagpipe.pp

@@ -21,6 +21,10 @@
 #
 # === Parameters
 #
+# [*package_ensure*]
+#   (optional) The state of the package
+#   Defaults to present
+#
 # [*bagpipe_bgp_port*]
 #   BGP component API port
 #   Defaults to $facts['os_service_default']
@@ -29,14 +33,10 @@
 #   OVS bridge to use
 #   Defaults to $facts['os_service_default']
 #
-# [*package_ensure*]
-#   (optional) The state of the package
-#   Defaults to present
-#
 class neutron::plugins::ml2::bagpipe (
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $bagpipe_bgp_port                       = $facts['os_service_default'],
   $mpls_bridge                            = $facts['os_service_default'],
-  $package_ensure          = 'present',
 ) {
   include neutron::deps
   include neutron::params

manifests/plugins/ml2/networking_baremetal.pp

@@ -11,7 +11,7 @@
 #   Defaults to 'present'
 #
 class neutron::plugins::ml2::networking_baremetal (
-  $package_ensure = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
 ) {
   include neutron::deps
   include neutron::params

manifests/plugins/ml2/ovn.pp

@@ -2,6 +2,12 @@
 #
 # === Parameters
 #
+# [*package_ensure*]
+#   (optional) The intended state of the python-networking-odl
+#   package, i.e. any of the possible values of the 'ensure'
+#   property for a package resource type.
+#   Defaults to 'present'
+#
 # [*ovn_nb_connection*]
 #   (optional) The connection string for the OVN_Northbound OVSDB.
 #   Defaults to $facts['os_service_default']
@@ -38,12 +44,6 @@
 #   verify certificates presented to it by SSL peers
 #   Defaults to $facts['os_service_default']
 #
-# [*package_ensure*]
-#   (optional) The intended state of the python-networking-odl
-#   package, i.e. any of the possible values of the 'ensure'
-#   property for a package resource type.
-#   Defaults to 'present'
-#
 # [*ovsdb_connection_timeout*]
 #   (optional) Timeout in seconds for the OVSDB connection transaction
 #   Defaults to $facts['os_service_default']
@@ -198,6 +198,7 @@
 #   Defaults to $facts['os_service_default']
 #
 class neutron::plugins::ml2::ovn (
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $ovn_nb_connection                      = $facts['os_service_default'],
   $ovn_sb_connection                      = $facts['os_service_default'],
   $ovn_nb_private_key                     = $facts['os_service_default'],
@@ -206,7 +207,6 @@ class neutron::plugins::ml2::ovn (
   $ovn_sb_private_key                     = $facts['os_service_default'],
   $ovn_sb_certificate                     = $facts['os_service_default'],
   $ovn_sb_ca_cert                         = $facts['os_service_default'],
-  $package_ensure                       = 'present',
   $ovsdb_connection_timeout               = $facts['os_service_default'],
   $ovsdb_retry_max_interval               = $facts['os_service_default'],
   $ovsdb_probe_interval                   = $facts['os_service_default'],

manifests/plugins/ml2/ovn/maintenance_worker.pp

@@ -15,7 +15,7 @@
 #   Defaults to true
 #
 class neutron::plugins::ml2::ovn::maintenance_worker (
-  $package_ensure         = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
 ) {

manifests/server.pp

@@ -236,7 +236,7 @@
 #   Defaults to undef
 #
 class neutron::server (
-  $package_ensure                   = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $enabled                        = true,
   Boolean $manage_service                 = true,
   $api_package_name                       = $neutron::params::api_package_name,

manifests/services/bgpvpn.pp

@@ -41,7 +41,7 @@
 #   Default to false.
 #
 class neutron::services::bgpvpn (
-  $package_ensure    = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $service_providers                      = 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default',
   Boolean $sync_db                        = false,
   $purge_config                           = false,

manifests/services/dr.pp

@@ -16,7 +16,7 @@
 #   Default to false.
 #
 class neutron::services::dr (
-  $package_ensure         = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $bgp_drscheduler_driver                 = $facts['os_service_default'],
   Boolean $sync_db                        = false,
 ) {

manifests/services/fwaas.pp

@@ -22,7 +22,7 @@
 #   Defaults to false.
 #
 class neutron::services::fwaas (
-  $package_ensure       = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $service_providers                      = 'FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default',
   Boolean $sync_db                        = false,
   Boolean $purge_config                   = false,

manifests/services/l2gw.pp

@@ -49,7 +49,7 @@ class neutron::services::l2gw (
   $periodic_monitoring_interval           = $facts['os_service_default'],
   $service_providers                      = 'L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.rpc_l2gw.L2gwRpcDriver:default',
   Boolean $sync_db                        = false,
-  $package_ensure               = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   Boolean $purge_config                   = false,
 ) {
   include neutron::deps

manifests/services/sfc.pp

@@ -54,7 +54,7 @@
 #   Defaults to $facts['os_service_default']
 #
 class neutron::services::sfc (
-  $package_ensure    = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $sfc_drivers                            = $facts['os_service_default'],
   $fc_drivers                             = $facts['os_service_default'],
   Boolean $sync_db                        = false,

manifests/services/taas.pp

@@ -38,7 +38,7 @@
 #   Defaults to false.
 #
 class neutron::services::taas (
-  $package_ensure       = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $service_providers                      = 'TAAS:TAAS:neutron_taas.services.taas.service_drivers.taas_rpc.TaasRpcDriver:default',
   $quota_tap_service                      = $facts['os_service_default'],
   $quota_tap_flow                         = $facts['os_service_default'],

manifests/services/vpnaas.pp

@@ -35,7 +35,7 @@
 #   Defaults to false.
 #
 class neutron::services::vpnaas (
-  $package_ensure                    = 'present',
+  Stdlib::Ensure::Package $package_ensure = 'present',
   $service_providers                      = 'VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default',
   $vpn_scheduler_driver                   = $facts['os_service_default'],
   $vpn_auto_schedule                      = $facts['os_service_default'],