Use common class to manage apache and magnum service in beaker job

Depends-on: https://review.opendev.org/#/c/747935/
Change-Id: I9126eaf62de7aa43fe3b2d6622dc484ec1ccc88e
(cherry picked from commit 990078c687)
This commit is contained in:
Takashi Kajinami 2020-08-27 12:04:45 +09:00
parent f2eea31735
commit 20ec1a8950
1 changed files with 3 additions and 64 deletions

View File

@ -8,76 +8,15 @@ describe 'basic magnum' do
pp= <<-EOS pp= <<-EOS
include openstack_integration include openstack_integration
include openstack_integration::repos include openstack_integration::repos
include openstack_integration::apache
include openstack_integration::rabbitmq include openstack_integration::rabbitmq
include openstack_integration::mysql include openstack_integration::mysql
include openstack_integration::keystone include openstack_integration::keystone
rabbitmq_vhost { '/magnum': class { 'openstack_integration::magnum':
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
rabbitmq_user { 'magnum':
admin => true,
password => 'an_even_bigger_secret',
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
rabbitmq_user_permissions { 'magnum@/':
configure_permission => '.*',
write_permission => '.*',
read_permission => '.*',
provider => 'rabbitmqctl',
require => Class['rabbitmq'],
}
# Magnum resources
class { 'magnum::keystone::auth':
password => 'a_big_secret',
public_url => 'http://127.0.0.1:9511/v1',
internal_url => 'http://127.0.0.1:9511/v1',
admin_url => 'http://127.0.0.1:9511/v1',
}
class { 'magnum::keystone::authtoken':
password => 'a_big_secret',
}
class { 'magnum::db::mysql':
password => 'magnum',
}
class { 'magnum::logging':
debug => true,
}
class { 'magnum::db':
database_connection => 'mysql://magnum:magnum@127.0.0.1/magnum',
}
class { 'magnum::keystone::domain':
domain_password => 'oh_my_no_secret',
}
class { 'magnum':
default_transport_url => 'rabbit://magnum:an_even_bigger_secret@127.0.0.1:5672/',
rabbit_use_ssl => false,
notification_driver => 'messagingv2',
}
class { 'magnum::api':
service_name => 'httpd',
}
include apache
include magnum::wsgi::apache
class { 'magnum::conductor': }
class { 'magnum::client': }
class { 'magnum::certificates':
cert_manager_type => 'local' cert_manager_type => 'local'
} }
class { 'magnum::clients': }
EOS EOS
# Run it twice to test for idempotency # Run it twice to test for idempotency
apply_manifest(pp, :catch_failures => true) apply_manifest(pp, :catch_failures => true)
@ -85,7 +24,7 @@ describe 'basic magnum' do
end end
describe port(9511) do describe port(9511) do
it { is_expected.to be_listening.with('tcp6') } it { is_expected.to be_listening }
end end
end end