[beisner,r=james-page]
Fixup amulet test exection for next branches. Resolve issues with librbd1 versions in 12.04. Update amulet test to deal with configuration options for debug/verbose logging.
This commit is contained in:
commit
7fb5e99358
|
@ -9,5 +9,9 @@ respawn
|
||||||
exec start-stop-daemon --start --chuid {{ user_name }} \
|
exec start-stop-daemon --start --chuid {{ user_name }} \
|
||||||
--chdir {{ start_dir }} --name {{ process_name }} \
|
--chdir {{ start_dir }} --name {{ process_name }} \
|
||||||
--exec {{ executable_name }} -- \
|
--exec {{ executable_name }} -- \
|
||||||
|
{% for config_file in config_files -%}
|
||||||
--config-file={{ config_file }} \
|
--config-file={{ config_file }} \
|
||||||
|
{% endfor -%}
|
||||||
|
{% if log_file -%}
|
||||||
--log-file={{ log_file }}
|
--log-file={{ log_file }}
|
||||||
|
{% endif -%}
|
||||||
|
|
|
@ -33,9 +33,9 @@ def bool_from_string(value):
|
||||||
|
|
||||||
value = value.strip().lower()
|
value = value.strip().lower()
|
||||||
|
|
||||||
if value in ['y', 'yes', 'true', 't']:
|
if value in ['y', 'yes', 'true', 't', 'on']:
|
||||||
return True
|
return True
|
||||||
elif value in ['n', 'no', 'false', 'f']:
|
elif value in ['n', 'no', 'false', 'f', 'off']:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
msg = "Unable to interpret string value '%s' as boolean" % (value)
|
msg = "Unable to interpret string value '%s' as boolean" % (value)
|
||||||
|
|
|
@ -57,6 +57,7 @@ TEMPLATES = 'templates/'
|
||||||
BASE_PACKAGES = [
|
BASE_PACKAGES = [
|
||||||
'nova-compute',
|
'nova-compute',
|
||||||
'genisoimage', # was missing as a package dependency until raring.
|
'genisoimage', # was missing as a package dependency until raring.
|
||||||
|
'librbd1', # bug 1440953
|
||||||
'python-six',
|
'python-six',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
|
@ -14,13 +14,13 @@ from charmhelpers.contrib.openstack.amulet.utils import (
|
||||||
)
|
)
|
||||||
|
|
||||||
# Use DEBUG to turn on debug logging
|
# Use DEBUG to turn on debug logging
|
||||||
u = OpenStackAmuletUtils(ERROR)
|
u = OpenStackAmuletUtils(DEBUG)
|
||||||
|
|
||||||
|
|
||||||
class NovaBasicDeployment(OpenStackAmuletDeployment):
|
class NovaBasicDeployment(OpenStackAmuletDeployment):
|
||||||
"""Amulet tests on a basic nova compute deployment."""
|
"""Amulet tests on a basic nova compute deployment."""
|
||||||
|
|
||||||
def __init__(self, series=None, openstack=None, source=None, stable=True):
|
def __init__(self, series=None, openstack=None, source=None, stable=False):
|
||||||
"""Deploy the entire test environment."""
|
"""Deploy the entire test environment."""
|
||||||
super(NovaBasicDeployment, self).__init__(series, openstack, source, stable)
|
super(NovaBasicDeployment, self).__init__(series, openstack, source, stable)
|
||||||
self._add_services()
|
self._add_services()
|
||||||
|
@ -362,7 +362,7 @@ class NovaBasicDeployment(OpenStackAmuletDeployment):
|
||||||
'lock_path': '/var/lock/nova',
|
'lock_path': '/var/lock/nova',
|
||||||
'force_dhcp_release': 'True',
|
'force_dhcp_release': 'True',
|
||||||
'libvirt_use_virtio_for_bridges': 'True',
|
'libvirt_use_virtio_for_bridges': 'True',
|
||||||
'verbose': 'True',
|
'verbose': 'False',
|
||||||
'use_syslog': 'False',
|
'use_syslog': 'False',
|
||||||
'ec2_private_dns_show_ip': 'True',
|
'ec2_private_dns_show_ip': 'True',
|
||||||
'api_paste_config': '/etc/nova/api-paste.ini',
|
'api_paste_config': '/etc/nova/api-paste.ini',
|
||||||
|
@ -377,8 +377,7 @@ class NovaBasicDeployment(OpenStackAmuletDeployment):
|
||||||
'glance_api_servers': glance_relation['glance-api-server'],
|
'glance_api_servers': glance_relation['glance-api-server'],
|
||||||
'flat_interface': 'eth1',
|
'flat_interface': 'eth1',
|
||||||
'network_manager': 'nova.network.manager.FlatDHCPManager',
|
'network_manager': 'nova.network.manager.FlatDHCPManager',
|
||||||
'volume_api_class': 'nova.volume.cinder.API',
|
'volume_api_class': 'nova.volume.cinder.API'}
|
||||||
'verbose': 'True'}
|
|
||||||
|
|
||||||
ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
|
ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
|
||||||
if ret:
|
if ret:
|
||||||
|
|
Loading…
Reference in New Issue