From 13fcea14caa8faf73f8fecefb2823e93b83d6b58 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 7 Aug 2020 09:42:40 +0900 Subject: [PATCH] Use common class to manage apache service in beaker job Depends-on: https://review.opendev.org/#/c/747935/ Change-Id: I5fc2b81f8a48e51a60daea311530645ce05f5fc5 (cherry picked from commit 093e6f16fa04565be05c56570ffbf3e4dad22f71) --- spec/acceptance/default_domain_spec.rb | 1 + spec/acceptance/keystone_federation_identity_provider_spec.rb | 1 + spec/acceptance/keystone_federation_shibboleth_spec.rb | 1 + spec/acceptance/keystone_wsgi_apache_spec.rb | 1 + 4 files changed, 4 insertions(+) diff --git a/spec/acceptance/default_domain_spec.rb b/spec/acceptance/default_domain_spec.rb index 4f4ce0889..507750893 100644 --- a/spec/acceptance/default_domain_spec.rb +++ b/spec/acceptance/default_domain_spec.rb @@ -15,6 +15,7 @@ describe 'basic keystone server with changed domain id' do <<-EOM include openstack_integration include openstack_integration::repos + include openstack_integration::apache include openstack_integration::mysql class { 'openstack_integration::keystone': diff --git a/spec/acceptance/keystone_federation_identity_provider_spec.rb b/spec/acceptance/keystone_federation_identity_provider_spec.rb index 018dc78a3..2c87afd6a 100644 --- a/spec/acceptance/keystone_federation_identity_provider_spec.rb +++ b/spec/acceptance/keystone_federation_identity_provider_spec.rb @@ -8,6 +8,7 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do pp= <<-EOS include openstack_integration include openstack_integration::repos + include openstack_integration::apache include openstack_integration::mysql include openstack_integration::keystone diff --git a/spec/acceptance/keystone_federation_shibboleth_spec.rb b/spec/acceptance/keystone_federation_shibboleth_spec.rb index e817de700..812e89a3f 100644 --- a/spec/acceptance/keystone_federation_shibboleth_spec.rb +++ b/spec/acceptance/keystone_federation_shibboleth_spec.rb @@ -8,6 +8,7 @@ describe 'keystone server running with Apache/WSGI as Service Provider with Shib pp= <<-EOS include openstack_integration include openstack_integration::repos + include openstack_integration::apache include openstack_integration::mysql include openstack_integration::keystone diff --git a/spec/acceptance/keystone_wsgi_apache_spec.rb b/spec/acceptance/keystone_wsgi_apache_spec.rb index 16ce5c7e9..6272eb656 100644 --- a/spec/acceptance/keystone_wsgi_apache_spec.rb +++ b/spec/acceptance/keystone_wsgi_apache_spec.rb @@ -8,6 +8,7 @@ describe 'keystone server running with Apache/WSGI with resources' do pp= <<-EOS include openstack_integration include openstack_integration::repos + include openstack_integration::apache include openstack_integration::mysql include openstack_integration::keystone