From 040f2cf540a3a7a01c77d78e26adeddecb79bc29 Mon Sep 17 00:00:00 2001 From: Anton Baranov Date: Wed, 16 May 2018 11:29:45 -0400 Subject: [PATCH] Do not require openvpn::client for client specific configs There is no need to require openvpn::client type as client configs don't rely on any of that type resources. It also not possible to use client_specific_config if extca_enabled is set to true for a server due to openvpn::client failure. Fixes #229 Signed-off-by: Anton Baranov --- manifests/client_specific_config.pp | 1 - spec/defines/openvpn_client_specific_config_spec.rb | 5 ----- 2 files changed, 6 deletions(-) diff --git a/manifests/client_specific_config.pp b/manifests/client_specific_config.pp index e5772515..9038afcf 100644 --- a/manifests/client_specific_config.pp +++ b/manifests/client_specific_config.pp @@ -88,7 +88,6 @@ ) { Openvpn::Server[$server] - -> Openvpn::Client[$name] -> Openvpn::Client_specific_config[$name] file { "${::openvpn::params::etc_directory}/openvpn/${server}/client-configs/${name}": diff --git a/spec/defines/openvpn_client_specific_config_spec.rb b/spec/defines/openvpn_client_specific_config_spec.rb index cf11d84e..f117925d 100644 --- a/spec/defines/openvpn_client_specific_config_spec.rb +++ b/spec/defines/openvpn_client_specific_config_spec.rb @@ -13,18 +13,13 @@ } end let(:pre_condition) do - [ 'openvpn::server { "test_server": country => "CO", province => "ST", city => "Some City", organization => "example.org", email => "testemail@example.org" - }', - 'openvpn::client { "test_client": - server => "test_server" }' - ].join end it { is_expected.to contain_file('/etc/openvpn/test_server/client-configs/test_client') }