diff --git a/resources/memcached_instance.rb b/resources/memcached_instance.rb index 05dac84..2e88fc2 100644 --- a/resources/memcached_instance.rb +++ b/resources/memcached_instance.rb @@ -20,7 +20,8 @@ # include Memcached::Helpers -resource_name :memcached_instance +provides :memcached_instance +provides :memcached_instance_systemd # legacy name property :instance_name, String, name_property: true property :memory, [Integer, String], default: 64 diff --git a/spec/unit/recipes/instance_spec.rb b/spec/unit/recipes/instance_spec.rb index 39360ac..30015e0 100644 --- a/spec/unit/recipes/instance_spec.rb +++ b/spec/unit/recipes/instance_spec.rb @@ -5,7 +5,7 @@ context 'on rhel 7' do platform 'redhat', '7' - step_into :memcached_instance + step_into :memcached_instance, :memcached_instance_systemd it do is_expected.to start_memcached_instance('web_cache').with( @@ -25,7 +25,7 @@ ) end it do - is_expected.to start_memcached_instance('backend_cache').with( + is_expected.to start_memcached_instance_systemd('backend_cache').with( memory: 64, port: 11213, udp_port: 11213, @@ -76,7 +76,7 @@ ) end it { is_expected.to enable_memcached_instance('web_cache') } - it { is_expected.to enable_memcached_instance('backend_cache') } + it { is_expected.to enable_memcached_instance_systemd('backend_cache') } it { is_expected.to enable_memcached_instance('painful_cache') } it { is_expected.to enable_memcached_instance('socket') } it { is_expected.to stop_service('disable default memcached') } @@ -109,7 +109,7 @@ context 'on ubuntu 18.04' do platform 'ubuntu', '18.04' - step_into :memcached_instance + step_into :memcached_instance, :memcached_instance_systemd it do is_expected.to start_memcached_instance('web_cache').with( @@ -127,7 +127,7 @@ ) end it do - is_expected.to start_memcached_instance('backend_cache').with( + is_expected.to start_memcached_instance_systemd('backend_cache').with( memory: 64, port: 11213, udp_port: 11213, @@ -178,7 +178,7 @@ ) end it { is_expected.to enable_memcached_instance('web_cache') } - it { is_expected.to enable_memcached_instance('backend_cache') } + it { is_expected.to enable_memcached_instance_systemd('backend_cache') } it { is_expected.to enable_memcached_instance('painful_cache') } it { is_expected.to enable_memcached_instance('socket') } it { is_expected.to stop_service('disable default memcached') } diff --git a/test/fixtures/cookbooks/test/recipes/instance.rb b/test/fixtures/cookbooks/test/recipes/instance.rb index 6836a18..773eac6 100644 --- a/test/fixtures/cookbooks/test/recipes/instance.rb +++ b/test/fixtures/cookbooks/test/recipes/instance.rb @@ -10,7 +10,7 @@ user 'memcached_other_user' user 'memcached_painful_cache' -memcached_instance 'backend_cache' do +memcached_instance_systemd 'backend_cache' do port 11_213 udp_port 11_213 memory 64