From e2432c4fdc5fc0da8e8349a8102679b9758e5b10 Mon Sep 17 00:00:00 2001 From: Ryan Beisner Date: Wed, 16 Mar 2016 17:36:08 +0000 Subject: [PATCH] Update amulet test to include a non-existent osd-devices value The osd-devices charm config option is a whitelist, and the charm needs to gracefully handle items in that whitelist which may not exist. Change-Id: Ieac69a69b74a13db192e4f0fb4fc49a2f83b3a4a --- tests/basic_deployment.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index b8f21ee5..1b24e60b 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -86,10 +86,12 @@ class CephBasicDeployment(OpenStackAmuletDeployment): 'monitor-secret': 'AQCXrnZQwI7KGBAAiPofmKEXKxu5bUzoYLVkbQ==', } + # Include a non-existent device as osd-devices is a whitelist, + # and this will catch cases where proposals attempt to change that. ceph_osd_config = { 'osd-reformat': 'yes', 'ephemeral-unmount': '/mnt', - 'osd-devices': '/dev/vdb /srv/ceph' + 'osd-devices': '/dev/vdb /srv/ceph /dev/test-non-existent' } configs = {'keystone': keystone_config,