diff --git a/manifests/server.pp b/manifests/server.pp index bb48840..e8b8077 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -51,7 +51,6 @@ class zaqar::server( } } elsif $service_name == 'httpd' { - include apache::params service { $::zaqar::params::service_name: ensure => 'stopped', name => $::zaqar::params::service_name, diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index aaba784..f3c3b3b 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -126,11 +126,6 @@ class zaqar::wsgi::apache ( include zaqar::deps include zaqar::params - include apache - include apache::mod::wsgi - if $ssl_real { - include apache::mod::ssl - } ::openstacklib::wsgi::apache { 'zaqar_wsgi': bind_host => $bind_host, diff --git a/metadata.json b/metadata.json index f9dc1ca..2e54888 100644 --- a/metadata.json +++ b/metadata.json @@ -20,10 +20,6 @@ { "name": "openstack/oslo", "version_requirement": ">=20.0.0 <21.0.0" - }, - { - "name": "puppetlabs/apache", - "version_requirement": ">=5.0.0" } ], "description": "Installs and configures OpenStack Zaqar.", diff --git a/spec/classes/zaqar_wsgi_apache_spec.rb b/spec/classes/zaqar_wsgi_apache_spec.rb index 3c2e584..b6f9bba 100644 --- a/spec/classes/zaqar_wsgi_apache_spec.rb +++ b/spec/classes/zaqar_wsgi_apache_spec.rb @@ -5,9 +5,6 @@ describe 'zaqar::wsgi::apache' do shared_examples_for 'apache serving zaqar with mod_wsgi' do context 'with default parameters' do it { is_expected.to contain_class('zaqar::params') } - it { is_expected.to contain_class('apache') } - it { is_expected.to contain_class('apache::mod::wsgi') } - it { is_expected.to contain_class('apache::mod::ssl') } it { is_expected.to contain_openstacklib__wsgi__apache('zaqar_wsgi').with( :bind_port => 8888, :group => 'zaqar', @@ -46,9 +43,6 @@ describe 'zaqar::wsgi::apache' do } end it { is_expected.to contain_class('zaqar::params') } - it { is_expected.to contain_class('apache') } - it { is_expected.to contain_class('apache::mod::wsgi') } - it { is_expected.to_not contain_class('apache::mod::ssl') } it { is_expected.to contain_openstacklib__wsgi__apache('zaqar_wsgi').with( :bind_host => '10.42.51.1', :bind_port => 12345,