openstack/puppet-zaqar
Code Issues Proposed changes

Remove MongoDB integration and transform to using POI resources

Browse Source 
This patch removes MongoDB beaker tests as this is not a well
tested use-case and sticks to the Swift/SQLalchemy configuration
which is well tested.  It switches Beaker to use the same resources
in integration.

Depends-On: Ic1a4ea20ef65a832a986964fb61e80c4738740b5
Change-Id: I9796a7bb2f25a2df53a1aeeb2814a91ca2c2cbec
This commit is contained in:
Mohammed Naser 2018-02-02 13:14:21 -05:00
parent 20dd37ee79
commit 462dd20b37
2 changed files with 2 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
spec/acceptance/zaqar_mongo_spec.rb
View File

@ -1,76 +0,0 @@
require 'spec_helper_acceptance'
describe 'basic zaqar' do
context 'default parameters' do
it 'zaqar with mongo should work with no errors' do
pp= <<-EOS
include ::openstack_integration
include ::openstack_integration::repos
include ::openstack_integration::mysql
include ::openstack_integration::keystone
class { '::zaqar::keystone::auth':
password => 'a_big_secret',
}
class { '::zaqar::keystone::auth_websocket':
password => 'a_big_secret',
}
include ::mongodb::globals
include ::mongodb::client
class { '::mongodb::server':
replset => 'zaqar',
replset_members => ['127.0.0.1:27017'],
dbpath_fix => false,
}
$zaqar_mongodb_conn_string = 'mongodb://127.0.0.1:27017'
Mongodb_replset['zaqar'] -> Package['zaqar-common']
class {'::zaqar::management::mongodb':
uri => $zaqar_mongodb_conn_string
}
class {'::zaqar::messaging::mongodb':
uri => $zaqar_mongodb_conn_string
}
class {'::zaqar::keystone::authtoken':
password => 'a_big_secret',
}
class {'::zaqar::logging':
debug => true,
}
class {'::zaqar':
unreliable => true,
}
class {'::zaqar::server':
service_name => 'httpd',
}
include ::apache
class { '::zaqar::wsgi::apache':
ssl => false,
}
# run a second instance using websockets, the Debian system does
# not support the use of services to run a second instance.
if $::osfamily == 'RedHat' {
zaqar::server_instance{ '1':
transport => 'websocket'
}
}
EOS
# Run it twice and test for idempotency
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)
end
describe port(8888) do
it { is_expected.to be_listening }
end
end
end

45
spec/acceptance/zaqar_swift_spec.rb
View File

@ -11,48 +11,8 @@ describe 'swift zaqar' do
include ::openstack_integration::mysql include ::openstack_integration::mysql
include ::openstack_integration::keystone include ::openstack_integration::keystone
include ::openstack_integration::swift include ::openstack_integration::swift
include ::openstack_integration::memcached
class { '::memcached': include ::openstack_integration::zaqar
listen_ip => '127.0.0.1',
}
class { '::zaqar::keystone::auth':
password => 'a_big_secret',
}
class { '::zaqar::keystone::auth_websocket':
password => 'a_big_secret',
}
class {'::zaqar::management::sqlalchemy':
uri => 'mysql+pymysql://zaqar:a_big_secret@127.0.0.1/zaqar?charset=utf8',
}
class {'::zaqar::messaging::swift':
uri => 'swift://zaqar:a_big_secret:/service'
}
class {'::zaqar::keystone::authtoken':
password => 'a_big_secret',
}
class {'::zaqar::logging':
debug => true,
}
class {'::zaqar':
unreliable => true,
}
class {'::zaqar::server':
service_name => 'httpd',
}
include ::apache
class { '::zaqar::wsgi::apache':
ssl => false,
}
# run a second instance using websockets, the Debian system does
# not support the use of services to run a second instance.
if $::osfamily == 'RedHat' {
zaqar::server_instance{ '1':
transport => 'websocket'
}
}
EOS EOS
@ -68,4 +28,3 @@ describe 'swift zaqar' do
end end
end end