diff --git a/rebuild b/rebuild index d907486..08ac52e 100644 --- a/rebuild +++ b/rebuild @@ -2,4 +2,4 @@ # when dependencies of the charm change, # but nothing in the charm needs to. # simply change the uuid to something new -1b817f14-1742-11e8-bf02-13a179b934e9 +93e11b9e-86a6-11e8-b3ac-9f8b2e5df0b9 diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py index 4801bb5..128e230 100644 --- a/src/tests/basic_deployment.py +++ b/src/tests/basic_deployment.py @@ -87,9 +87,7 @@ class CephFsBasicDeployment(OpenStackAmuletDeployment): ceph_fs_config = { 'source': self.source, } - # NOTE(jamespage): fix fsid to allow later validation ceph_mon_config = { - 'fsid': '6547bd3e-1397-11e2-82e5-53567c8d32dc', 'source': self.source, } # Include a non-existent device as osd-devices is a whitelist, @@ -180,9 +178,10 @@ class CephFsBasicDeployment(OpenStackAmuletDeployment): u.log.debug('Checking ceph config file data...') unit = self.ceph_mon0_sentry conf = '/etc/ceph/ceph.conf' + (fsid, _) = unit.run('leader-get fsid') expected = { 'global': { - 'fsid': '6547bd3e-1397-11e2-82e5-53567c8d32dc', + 'fsid': fsid, 'log to syslog': 'false', 'err to syslog': 'false', 'clog to syslog': 'false',