Re-enable zaqar testing on Ubuntu
Already have these packages of zaqar in latest UCA[0], so re-enable zaqar testing on Ubuntu. [0]: http://ubuntu-cloud.archive.canonical.com/ubuntu/dists/xenial-updates/newton/main/binary-amd64/Packages Depends-On: https://review.openstack.org/#/c/399980/ Change-Id: Idb1521ce56c600027e8686652045a6963adae9b6
This commit is contained in:
parent
d78aa7a46a
commit
b7c73daa13
@ -17,8 +17,6 @@
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
$ipv6 = false
|
||||
# zaqar is not packaged in Ubuntu Trusty
|
||||
$zaqar_enabled = false
|
||||
# we'll start testing barbican after Newton stable, Ubuntu packaging is not
|
||||
# updated enough.
|
||||
$barbican_enabled = false
|
||||
@ -27,7 +25,6 @@ case $::osfamily {
|
||||
}
|
||||
'RedHat': {
|
||||
$ipv6 = true
|
||||
$zaqar_enabled = true
|
||||
$barbican_enabled = true
|
||||
$ec2api_enabled = true
|
||||
}
|
||||
@ -85,7 +82,7 @@ class { '::openstack_integration::tempest':
|
||||
cinder_backup => true,
|
||||
swift => true,
|
||||
ironic => true,
|
||||
zaqar => $zaqar_enabled,
|
||||
zaqar => true,
|
||||
attach_encrypted_volume => $barbican_enabled,
|
||||
ec2api => $ec2api_enabled,
|
||||
}
|
||||
|
@ -2,11 +2,15 @@ class openstack_integration::zaqar {
|
||||
|
||||
include ::openstack_integration::config
|
||||
|
||||
# zaqar is not packaged in Ubuntu Cloud Archive
|
||||
if $::osfamily == 'RedHat' {
|
||||
class { '::zaqar::keystone::auth':
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
# TODO(zhongshengping): temporarily added this package
|
||||
if $::osfamily == 'Debian' {
|
||||
package { 'python-pymongo':
|
||||
ensure => present,
|
||||
}
|
||||
}
|
||||
$zaqar_mongodb_conn_string = 'mongodb://127.0.0.1:27017'
|
||||
class {'::zaqar::management::mongodb':
|
||||
uri => $zaqar_mongodb_conn_string
|
||||
@ -24,7 +28,9 @@ class openstack_integration::zaqar {
|
||||
}
|
||||
Mongodb_replset['openstack'] -> Package['zaqar-common']
|
||||
include ::zaqar::server
|
||||
# run a second instance using websockets
|
||||
# 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'
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user