From 21e6213eaf35c5e9a02d24a0cf2c83ffde57f220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 22 Nov 2023 16:36:05 -1000 Subject: [PATCH] Remove legacy top-scope syntax --- README.md | 22 +++++++++---------- REFERENCE.md | 2 +- manifests/init.pp | 2 +- .../redis_multi_instances_one_host_spec.rb | 2 +- spec/acceptance/suites/default/redis_spec.rb | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 89a929b7..4562ef92 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ ### Standalone ```puppet -include ::redis +include redis ``` ### Master node ```puppet -class { '::redis': +class { 'redis': bind => '10.0.1.1', } ``` @@ -27,7 +27,7 @@ class { '::redis': With authentication ```puppet -class { '::redis': +class { 'redis': bind => '10.0.1.1', masterauth => 'secret', } @@ -36,7 +36,7 @@ class { '::redis': ### Slave node ```puppet -class { '::redis': +class { 'redis': bind => '10.0.1.2', slaveof => '10.0.1.1 6379', } @@ -45,7 +45,7 @@ class { '::redis': With authentication ```puppet -class { '::redis': +class { 'redis': bind => '10.0.1.2', slaveof => '10.0.1.1 6379', masterauth => 'secret', @@ -55,7 +55,7 @@ class { '::redis': ### Redis 3.0 Clustering ```puppet -class { '::redis': +class { 'redis': bind => '10.0.1.2', appendonly => true, cluster_enabled => true, @@ -70,7 +70,7 @@ class { '::redis': ```puppet $listening_ports = [6379,6380,6381,6382] -class { '::redis': +class { 'redis': default_install => false, service_enable => false, service_ensure => 'stopped', @@ -97,7 +97,7 @@ Disabled by default but if you really want the module to manage the required repositories you can use this snippet: ```puppet -class { '::redis': +class { 'redis': manage_repo => true, } ``` @@ -105,7 +105,7 @@ class { '::redis': On Ubuntu, you can use a PPA by using the `ppa_repo` parameter: ```puppet -class { '::redis': +class { 'redis': manage_repo => true, ppa_repo => 'ppa:rwky/redis', } @@ -120,13 +120,13 @@ Optionally install and configuration a redis-sentinel server. With default settings: ```puppet -include ::redis::sentinel +include redis::sentinel ``` With adjustments: ```puppet -class { '::redis::sentinel': +class { 'redis::sentinel': master_name => 'cow', redis_host => '192.168.1.5', failover_timeout => 30000, diff --git a/REFERENCE.md b/REFERENCE.md index 4a04851a..111d33d7 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -59,7 +59,7 @@ include redis ##### Slave Node ```puppet -class { '::redis': +class { 'redis': bind => '10.0.1.2', slaveof => '10.0.1.1 6379', } diff --git a/manifests/init.pp b/manifests/init.pp index 316a1f7f..6b79e612 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,7 @@ # include redis # # @example Slave Node -# class { '::redis': +# class { 'redis': # bind => '10.0.1.2', # slaveof => '10.0.1.1 6379', # } diff --git a/spec/acceptance/suites/default/redis_multi_instances_one_host_spec.rb b/spec/acceptance/suites/default/redis_multi_instances_one_host_spec.rb index 197f1b50..24307317 100644 --- a/spec/acceptance/suites/default/redis_multi_instances_one_host_spec.rb +++ b/spec/acceptance/suites/default/redis_multi_instances_one_host_spec.rb @@ -33,7 +33,7 @@ pp = <<-EOS $listening_ports = #{instances} - class { '::redis': + class { 'redis': default_install => false, service_enable => false, service_ensure => 'stopped', diff --git a/spec/acceptance/suites/default/redis_spec.rb b/spec/acceptance/suites/default/redis_spec.rb index 854c21ab..58d04414 100644 --- a/spec/acceptance/suites/default/redis_spec.rb +++ b/spec/acceptance/suites/default/redis_spec.rb @@ -47,7 +47,7 @@ it 'runs successfully when using Redis apt repository', if: (fact('os.family') == 'Debian') do pp = <<-EOS - class { '::redis': + class { 'redis': manage_repo => true, redis_apt_repo => true, }