diff --git a/cluster/ceph.py b/cluster/ceph.py index f0aea803..eba58ff9 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -756,14 +756,7 @@ def mkpool(self, name, profile_name, application, base_name=None): continue_if_error=False).communicate() if crush_profile: - try: - rule_index = int(crush_profile) - # set crush profile using the integer 0-based index of crush rule - # displayed by: ceph osd crush rule ls - ruleset = crush_profile - except ValueError: - ruleset = self.get_ruleset(crush_profile) - common.pdsh(settings.getnodes('head'), 'sudo %s -c %s osd pool set %s crush_ruleset %s' % (self.ceph_cmd, self.tmp_conf, name, crush_profile), + common.pdsh(settings.getnodes('head'), 'sudo %s -c %s osd pool set %s crush_rule %s' % (self.ceph_cmd, self.tmp_conf, name, crush_profile), continue_if_error=False).communicate() logger.info('Checking Health after pool creation.') diff --git a/example/example-kvmrbdfio.yaml b/example/example-kvmrbdfio.yaml index f09ce0ce..aa9445b6 100644 --- a/example/example-kvmrbdfio.yaml +++ b/example/example-kvmrbdfio.yaml @@ -21,7 +21,7 @@ cluster: pg_size: 64 pgp_size: 64 replication: 3 - crush_profile: 1 + crush_profile: replicated_rule benchmarks: kvmrbdfio: fio_cmd: /usr/local/bin/fio