openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Re-enable zaqar testing on Ubuntu"

Browse Source
This commit is contained in:
Jenkins
2016-11-30 18:01:36 +00:00
committed by Gerrit Code Review
parent 6952029ab3 b7c73daa13
commit f683e94170
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fixtures/scenario002.pp
View File

@@ -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,
}

50
manifests/zaqar.pp
View File

@@ -2,29 +2,35 @@ class openstack_integration::zaqar {
include ::openstack_integration::config
# zaqar is not packaged in Ubuntu Cloud Archive
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
}
class {'::zaqar::messaging::mongodb':
uri => $zaqar_mongodb_conn_string
}
class {'::zaqar::keystone::authtoken':
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
password => 'a_big_secret',
}
class {'::zaqar':
unreliable => true,
}
Mongodb_replset['openstack'] -> Package['zaqar-common']
include ::zaqar::server
# run a second instance using websockets, the Debian system does
# not support the use of services to run a second instance.
if $::osfamily == 'RedHat' {
class { '::zaqar::keystone::auth':
password => 'a_big_secret',
}
$zaqar_mongodb_conn_string = 'mongodb://127.0.0.1:27017'
class {'::zaqar::management::mongodb':
uri => $zaqar_mongodb_conn_string
}
class {'::zaqar::messaging::mongodb':
uri => $zaqar_mongodb_conn_string
}
class {'::zaqar::keystone::authtoken':
auth_url => $::openstack_integration::config::keystone_admin_uri,
auth_uri => $::openstack_integration::config::keystone_auth_uri,
password => 'a_big_secret',
}
class {'::zaqar':
unreliable => true,
}
Mongodb_replset['openstack'] -> Package['zaqar-common']
include ::zaqar::server
# run a second instance using websockets
zaqar::server_instance{ '1':
transport => 'websocket'
}