diff --git a/.gitignore b/.gitignore index f216f36..1f33487 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ bin *.sw[nop] *.pyc wily +tests/*.tar.xz diff --git a/hooks/lxd_utils.py b/hooks/lxd_utils.py index 3d8b1b2..1b34a9c 100644 --- a/hooks/lxd_utils.py +++ b/hooks/lxd_utils.py @@ -102,7 +102,8 @@ DEFAULT_LOOPBACK_SIZE = '10G' PW_LENGTH = 16 ZFS_POOL_NAME = 'lxd' EXT4_USERNS_MOUNTS = "/sys/module/ext4/parameters/userns_mounts" -LXD_POOL = 'juju_lxd' +# due to bug: 1793137 we have to make this the same as ZFS_POOL_NAME. +LXD_POOL = 'lxd' VG_NAME = 'lxd_vg' diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 09919c5..33d5c3c 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -99,7 +99,6 @@ class LXDBasicDeployment(OpenStackAmuletDeployment): relations = { 'lxd:lxd': 'nova-compute:lxd', 'nova-compute:image-service': 'glance:image-service', - 'nova-compute:shared-db': 'percona-cluster:shared-db', 'nova-compute:amqp': 'rabbitmq-server:amqp', 'nova-cloud-controller:shared-db': 'percona-cluster:shared-db', 'nova-cloud-controller:identity-service': 'keystone:'