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
This commit is contained in:
parent
c3fd3ba7b0
commit
4d7b3e9240
|
@ -6,3 +6,4 @@ bin
|
|||
*.sw[nop]
|
||||
*.pyc
|
||||
wily
|
||||
tests/*.tar.xz
|
||||
|
|
|
@ -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'
|
||||
|
||||
|
||||
|
|
|
@ -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:'
|
||||
|
|
Loading…
Reference in New Issue