X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Fmanifests%2Finit.pp;h=12b0bd78e877a659aeb43d5444bddfea651e7d6c;hb=a526f7e1c2d30c1cd7e075a23808d9003ac38089;hp=233d3910736f1968c7e7cc6e7e35ad4658b505d3;hpb=921e69100a563cf143f56a3905d8362336d939ff;p=mirror%2Fdsa-puppet.git diff --git a/3rdparty/modules/rabbitmq/manifests/init.pp b/3rdparty/modules/rabbitmq/manifests/init.pp index 233d39107..12b0bd78e 100644 --- a/3rdparty/modules/rabbitmq/manifests/init.pp +++ b/3rdparty/modules/rabbitmq/manifests/init.pp @@ -92,7 +92,6 @@ # @param config_cluster Enable or disable clustering support. # @param config_kernel_variables Hash of Erlang kernel configuration variables to set (see [Variables Configurable in rabbitmq.config](#variables-configurable-in-rabbitmq.config)). # @param config_path The path to write the RabbitMQ configuration file to. -# @param config_ranch When true, suppress config directives needed for older (<3.6) RabbitMQ versions. # @param config_management_variables Hash of configuration variables for the [Management Plugin](https://www.rabbitmq.com/management.html). # @param config_stomp Enable or disable stomp. # @param config_shovel Enable or disable shovel. @@ -146,7 +145,6 @@ # @param service_ensure The state of the service. # @param service_manage Determines if the service is managed. # @param service_name The name of the service to manage. -# @param $service_restart. Default defined in param.pp. Whether to resetart the service on config change. # @param ssl Configures the service for using SSL. # port => UNSET # @param ssl_cacert CA cert path to use for SSL. @@ -188,101 +186,98 @@ # @param rabbitmq_home OS dependent. default defined in param.pp. The home directory of the rabbitmq deamon. # @param $rabbitmqadmin_package OS dependent. default defined in param.pp. If undef: install rabbitmqadmin via archive, otherwise via package # @param $archive_options. default defined in param.pp. Extra options to Archive resource to download rabbitmqadmin file -# @param $loopback_users. default defined in param.pp. This option configures a list of users to allow access via the loopback interfaces class rabbitmq( - Boolean $admin_enable = $rabbitmq::params::admin_enable, - Enum['ram', 'disk', 'disc'] $cluster_node_type = $rabbitmq::params::cluster_node_type, - Array $cluster_nodes = $rabbitmq::params::cluster_nodes, - String $config = $rabbitmq::params::config, - Boolean $config_cluster = $rabbitmq::params::config_cluster, - Stdlib::Absolutepath $config_path = $rabbitmq::params::config_path, - Boolean $config_ranch = $rabbitmq::params::config_ranch, - Boolean $config_stomp = $rabbitmq::params::config_stomp, - Boolean $config_shovel = $rabbitmq::params::config_shovel, - Hash $config_shovel_statics = $rabbitmq::params::config_shovel_statics, - String $default_user = $rabbitmq::params::default_user, - String $default_pass = $rabbitmq::params::default_pass, - Boolean $delete_guest_user = $rabbitmq::params::delete_guest_user, - String $env_config = $rabbitmq::params::env_config, - Stdlib::Absolutepath $env_config_path = $rabbitmq::params::env_config_path, - Optional[String] $erlang_cookie = undef, - Optional[String] $interface = undef, - Optional[String] $management_ip_address = undef, - Integer[1, 65535] $management_port = $rabbitmq::params::management_port, - Boolean $management_ssl = $rabbitmq::params::management_ssl, - Optional[String] $management_hostname = undef, - Optional[String] $node_ip_address = undef, - Optional[Variant[Numeric, String]] $package_apt_pin = undef, - String $package_ensure = $rabbitmq::params::package_ensure, - Optional[String] $package_gpg_key = $rabbitmq::params::package_gpg_key, - Variant[String, Array] $package_name = $rabbitmq::params::package_name, - Optional[String] $package_source = undef, - Optional[String] $package_provider = undef, - Boolean $repos_ensure = $rabbitmq::params::repos_ensure, - Boolean $manage_python = $rabbitmq::params::manage_python, - String $rabbitmq_user = $rabbitmq::params::rabbitmq_user, - String $rabbitmq_group = $rabbitmq::params::rabbitmq_group, - Stdlib::Absolutepath $rabbitmq_home = $rabbitmq::params::rabbitmq_home, - Integer $port = $rabbitmq::params::port, - Boolean $tcp_keepalive = $rabbitmq::params::tcp_keepalive, - Integer $tcp_backlog = $rabbitmq::params::tcp_backlog, - Optional[Integer] $tcp_sndbuf = undef, - Optional[Integer] $tcp_recbuf = undef, - Optional[Integer] $heartbeat = undef, - Enum['running', 'stopped'] $service_ensure = $rabbitmq::params::service_ensure, - Boolean $service_manage = $rabbitmq::params::service_manage, - String $service_name = $rabbitmq::params::service_name, - Boolean $ssl = $rabbitmq::params::ssl, - Boolean $ssl_only = $rabbitmq::params::ssl_only, - Optional[Stdlib::Absolutepath] $ssl_cacert = undef, - Optional[Stdlib::Absolutepath] $ssl_cert = undef, - Optional[Stdlib::Absolutepath] $ssl_key = undef, - Optional[Integer] $ssl_depth = undef, - Optional[String] $ssl_cert_password = undef, - Integer[1, 65535] $ssl_port = $rabbitmq::params::ssl_port, - Optional[String] $ssl_interface = undef, - Integer[1, 65535] $ssl_management_port = $rabbitmq::params::ssl_management_port, - Integer[1, 65535] $ssl_stomp_port = $rabbitmq::params::ssl_stomp_port, - Enum['verify_none','verify_peer'] $ssl_verify = $rabbitmq::params::ssl_verify, - Boolean $ssl_fail_if_no_peer_cert = $rabbitmq::params::ssl_fail_if_no_peer_cert, - Enum['verify_none','verify_peer'] $ssl_management_verify = $rabbitmq::params::ssl_management_verify, - Boolean $ssl_management_fail_if_no_peer_cert = $rabbitmq::params::ssl_management_fail_if_no_peer_cert, - Optional[Array] $ssl_versions = undef, - Boolean $ssl_secure_renegotiate = $rabbitmq::params::ssl_secure_renegotiate, - Boolean $ssl_reuse_sessions = $rabbitmq::params::ssl_reuse_sessions, - Boolean $ssl_honor_cipher_order = $rabbitmq::params::ssl_honor_cipher_order, - Optional[Stdlib::Absolutepath] $ssl_dhfile = undef, - Array $ssl_ciphers = $rabbitmq::params::ssl_ciphers, - Boolean $stomp_ensure = $rabbitmq::params::stomp_ensure, - Boolean $ldap_auth = $rabbitmq::params::ldap_auth, - String $ldap_server = $rabbitmq::params::ldap_server, - Optional[String] $ldap_user_dn_pattern = $rabbitmq::params::ldap_user_dn_pattern, - String $ldap_other_bind = $rabbitmq::params::ldap_other_bind, - Boolean $ldap_use_ssl = $rabbitmq::params::ldap_use_ssl, - Integer[1, 65535] $ldap_port = $rabbitmq::params::ldap_port, - Boolean $ldap_log = $rabbitmq::params::ldap_log, - Hash $ldap_config_variables = $rabbitmq::params::ldap_config_variables, - Integer[1, 65535] $stomp_port = $rabbitmq::params::stomp_port, - Boolean $stomp_ssl_only = $rabbitmq::params::stomp_ssl_only, - Boolean $wipe_db_on_cookie_change = $rabbitmq::params::wipe_db_on_cookie_change, - String $cluster_partition_handling = $rabbitmq::params::cluster_partition_handling, - Variant[Integer[-1],Enum['unlimited'],Pattern[/^(infinity|\d+(:(infinity|\d+))?)$/]] $file_limit = $rabbitmq::params::file_limit, - Hash $environment_variables = $rabbitmq::params::environment_variables, - Hash $config_variables = $rabbitmq::params::config_variables, - Hash $config_kernel_variables = $rabbitmq::params::config_kernel_variables, - Hash $config_management_variables = $rabbitmq::params::config_management_variables, - Hash $config_additional_variables = $rabbitmq::params::config_additional_variables, - Optional[Array] $auth_backends = undef, - Optional[String] $key_content = undef, - Optional[Integer] $collect_statistics_interval = undef, - Boolean $ipv6 = $rabbitmq::params::ipv6, - String $inetrc_config = $rabbitmq::params::inetrc_config, - Stdlib::Absolutepath $inetrc_config_path = $rabbitmq::params::inetrc_config_path, - Boolean $ssl_erl_dist = $rabbitmq::params::ssl_erl_dist, - Optional[String] $rabbitmqadmin_package = $rabbitmq::params::rabbitmqadmin_package, - Array $archive_options = $rabbitmq::params::archive_options, - Array $loopback_users = $rabbitmq::params::loopback_users, - Boolean $service_restart = $rabbitmq::params::service_restart, + Boolean $admin_enable = $rabbitmq::params::admin_enable, + Enum['ram', 'disk', 'disc'] $cluster_node_type = $rabbitmq::params::cluster_node_type, + Array $cluster_nodes = $rabbitmq::params::cluster_nodes, + String $config = $rabbitmq::params::config, + Boolean $config_cluster = $rabbitmq::params::config_cluster, + Stdlib::Absolutepath $config_path = $rabbitmq::params::config_path, + Boolean $config_ranch = $rabbitmq::params::config_ranch, + Boolean $config_stomp = $rabbitmq::params::config_stomp, + Boolean $config_shovel = $rabbitmq::params::config_shovel, + Hash $config_shovel_statics = $rabbitmq::params::config_shovel_statics, + String $default_user = $rabbitmq::params::default_user, + String $default_pass = $rabbitmq::params::default_pass, + Boolean $delete_guest_user = $rabbitmq::params::delete_guest_user, + String $env_config = $rabbitmq::params::env_config, + Stdlib::Absolutepath $env_config_path = $rabbitmq::params::env_config_path, + Optional[String] $erlang_cookie = undef, + Optional[String] $interface = undef, + Optional[String] $management_ip_address = undef, + Integer[1, 65535] $management_port = $rabbitmq::params::management_port, + Boolean $management_ssl = $rabbitmq::params::management_ssl, + Optional[String] $management_hostname = undef, + Optional[String] $node_ip_address = undef, + Optional[Variant[Numeric, String]] $package_apt_pin = undef, + String $package_ensure = $rabbitmq::params::package_ensure, + Optional[String] $package_gpg_key = $rabbitmq::params::package_gpg_key, + Variant[String, Array] $package_name = $rabbitmq::params::package_name, + Optional[String] $package_source = undef, + Optional[String] $package_provider = undef, + Boolean $repos_ensure = $rabbitmq::params::repos_ensure, + Boolean $manage_python = $rabbitmq::params::manage_python, + String $rabbitmq_user = $rabbitmq::params::rabbitmq_user, + String $rabbitmq_group = $rabbitmq::params::rabbitmq_group, + Stdlib::Absolutepath $rabbitmq_home = $rabbitmq::params::rabbitmq_home, + Integer $port = $rabbitmq::params::port, + Boolean $tcp_keepalive = $rabbitmq::params::tcp_keepalive, + Integer $tcp_backlog = $rabbitmq::params::tcp_backlog, + Optional[Integer] $tcp_sndbuf = undef, + Optional[Integer] $tcp_recbuf = undef, + Optional[Integer] $heartbeat = undef, + Enum['running', 'stopped'] $service_ensure = $rabbitmq::params::service_ensure, + Boolean $service_manage = $rabbitmq::params::service_manage, + String $service_name = $rabbitmq::params::service_name, + Boolean $ssl = $rabbitmq::params::ssl, + Boolean $ssl_only = $rabbitmq::params::ssl_only, + Optional[Stdlib::Absolutepath] $ssl_cacert = undef, + Optional[Stdlib::Absolutepath] $ssl_cert = undef, + Optional[Stdlib::Absolutepath] $ssl_key = undef, + Optional[Integer] $ssl_depth = undef, + Optional[String] $ssl_cert_password = undef, + Integer[1, 65535] $ssl_port = $rabbitmq::params::ssl_port, + Optional[String] $ssl_interface = undef, + Integer[1, 65535] $ssl_management_port = $rabbitmq::params::ssl_management_port, + Integer[1, 65535] $ssl_stomp_port = $rabbitmq::params::ssl_stomp_port, + Enum['verify_none','verify_peer'] $ssl_verify = $rabbitmq::params::ssl_verify, + Boolean $ssl_fail_if_no_peer_cert = $rabbitmq::params::ssl_fail_if_no_peer_cert, + Enum['verify_none','verify_peer'] $ssl_management_verify = $rabbitmq::params::ssl_management_verify, + Boolean $ssl_management_fail_if_no_peer_cert = $rabbitmq::params::ssl_management_fail_if_no_peer_cert, + Optional[Array] $ssl_versions = undef, + Boolean $ssl_secure_renegotiate = $rabbitmq::params::ssl_secure_renegotiate, + Boolean $ssl_reuse_sessions = $rabbitmq::params::ssl_reuse_sessions, + Boolean $ssl_honor_cipher_order = $rabbitmq::params::ssl_honor_cipher_order, + Optional[Stdlib::Absolutepath] $ssl_dhfile = undef, + Array $ssl_ciphers = $rabbitmq::params::ssl_ciphers, + Boolean $stomp_ensure = $rabbitmq::params::stomp_ensure, + Boolean $ldap_auth = $rabbitmq::params::ldap_auth, + String $ldap_server = $rabbitmq::params::ldap_server, + Optional[String] $ldap_user_dn_pattern = $rabbitmq::params::ldap_user_dn_pattern, + String $ldap_other_bind = $rabbitmq::params::ldap_other_bind, + Boolean $ldap_use_ssl = $rabbitmq::params::ldap_use_ssl, + Integer[1, 65535] $ldap_port = $rabbitmq::params::ldap_port, + Boolean $ldap_log = $rabbitmq::params::ldap_log, + Hash $ldap_config_variables = $rabbitmq::params::ldap_config_variables, + Integer[1, 65535] $stomp_port = $rabbitmq::params::stomp_port, + Boolean $stomp_ssl_only = $rabbitmq::params::stomp_ssl_only, + Boolean $wipe_db_on_cookie_change = $rabbitmq::params::wipe_db_on_cookie_change, + String $cluster_partition_handling = $rabbitmq::params::cluster_partition_handling, + Variant[Integer[-1,], Enum['unlimited', 'infinity']] $file_limit = $rabbitmq::params::file_limit, + Hash $environment_variables = $rabbitmq::params::environment_variables, + Hash $config_variables = $rabbitmq::params::config_variables, + Hash $config_kernel_variables = $rabbitmq::params::config_kernel_variables, + Hash $config_management_variables = $rabbitmq::params::config_management_variables, + Hash $config_additional_variables = $rabbitmq::params::config_additional_variables, + Optional[Array] $auth_backends = undef, + Optional[String] $key_content = undef, + Optional[Integer] $collect_statistics_interval = undef, + Boolean $ipv6 = $rabbitmq::params::ipv6, + String $inetrc_config = $rabbitmq::params::inetrc_config, + Stdlib::Absolutepath $inetrc_config_path = $rabbitmq::params::inetrc_config_path, + Boolean $ssl_erl_dist = $rabbitmq::params::ssl_erl_dist, + Optional[String] $rabbitmqadmin_package = $rabbitmq::params::rabbitmqadmin_package, + Array $archive_options = $rabbitmq::params::archive_options, ) inherits rabbitmq::params { if $ssl_only and ! $ssl { @@ -362,13 +357,9 @@ class rabbitmq( } } - if ($service_restart) { - Class['rabbitmq::config'] ~> Class['rabbitmq::service'] - } - Class['rabbitmq::install'] -> Class['rabbitmq::config'] - -> Class['rabbitmq::service'] + ~> Class['rabbitmq::service'] -> Class['rabbitmq::management'] # Make sure the various providers have their requirements in place.