openstack/puppet-tempest
Code Issues Proposed changes

Merge "Add cinder backup test"

Browse Source
This commit is contained in:
Jenkins
2016-09-27 23:21:36 +00:00
committed by Gerrit Code Review
parent 927f492ca5 bcf7be9a5a
commit ffa0f1f3c8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@@ -100,6 +100,8 @@
# Defaults to undef # Defaults to undef
# [*cinder_available*] # [*cinder_available*]
# Defaults to true # Defaults to true
# [*cinder_backup_available*]
# Defaults to false
# [*glance_available*] # [*glance_available*]
# Defaults to true # Defaults to true
# [*heat_available*] # [*heat_available*]
@@ -262,7 +264,7 @@ class tempest(
$use_dynamic_credentials = undef, $use_dynamic_credentials = undef,
# neutron config # neutron config
$public_network_id = undef, $public_network_id = undef,
# Upstream has a bad defaul t - set it to empty string. # Upstream has a bad default - set it to empty string.
$public_router_id = '', $public_router_id = '',
# Sahara config # Sahara config
$sahara_plugins = undef, $sahara_plugins = undef,
@@ -270,6 +272,7 @@ class tempest(
$db_flavor_ref = $::os_service_default, $db_flavor_ref = $::os_service_default,
# Service configuration # Service configuration
$cinder_available = true, $cinder_available = true,
$cinder_backup_available = true,
$glance_available = true, $glance_available = true,
$heat_available = false, $heat_available = false,
$ceilometer_available = false, $ceilometer_available = false,
@@ -455,6 +458,7 @@ class tempest(
'dashboard/dashboard_url': value => $dashboard_url; 'dashboard/dashboard_url': value => $dashboard_url;
'database/db_flavor_ref': value => $db_flavor_ref; 'database/db_flavor_ref': value => $db_flavor_ref;
'service_available/cinder': value => $cinder_available; 'service_available/cinder': value => $cinder_available;
'volume_feature_enabled/backup': value => $cinder_backup_available;
'service_available/glance': value => $glance_available; 'service_available/glance': value => $glance_available;
'service_available/heat': value => $heat_available; 'service_available/heat': value => $heat_available;
'service_available/ceilometer': value => $ceilometer_available; 'service_available/ceilometer': value => $ceilometer_available;