summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris MacNaughton <chris.macnaughton@canonical.com>2018-07-18 10:21:03 +0200
committerAlex Kavanagh <alex@ajkavanagh.co.uk>2018-09-18 14:46:58 +0200
commit4d7b3e924008af878b0c369c1bd3e92238d51a93 (patch)
treecfc848121cd5dddbfa598be706be2622ddb611bf
parentc3fd3ba7b0a9f46723ef839cec09c3d9b12a8e46 (diff)
downloadcharm-nova-lxd-4d7b3e924008af878b0c369c1bd3e92238d51a93.zip
charm-nova-lxd-4d7b3e924008af878b0c369c1bd3e92238d51a93.tar.gz
charm-nova-lxd-4d7b3e924008af878b0c369c1bd3e92238d51a93.tar.bz2
Remove old nova-compute / mysql relation and patch for nova-lxd bug
This review is modified to include a patch to resolve bug #1793137 which is due to a bug in nova-lxd where the wrong pool name (lxd) is used with zfs if lxd is new enough that the storage.zfs_pool_name key is missing from the config. This is the case on bionic and snap installed lxd. Closes-Bug: #1713807 Related-Bug: #1793137 Change-Id: I1123d9882bdb00e9183424b363fc3d1ff25f2346
-rw-r--r--.gitignore1
-rw-r--r--hooks/lxd_utils.py3
-rw-r--r--tests/basic_deployment.py1
3 files changed, 3 insertions, 2 deletions
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:'

This mirror site include all the OpenStack related repositories under: openstack, openstack-dev and openstack-infra.

NOTE: All repositories are updated every one hour.

Usage

For Git Clone
 git clone http://git.trystack.cn/openstack/nova.git 
For DevStack

Add GIT_BASE, NOVNC_REPO and SPICE_REPO variables to local.conf file.

[[local|localrc]]

# use TryStack git mirror
GIT_BASE=http://git.trystack.cn
NOVNC_REPO=http://git.trystack.cn/kanaka/noVNC.git
SPICE_REPO=http://git.trystack.cn/git/spice/spice-html5.git