diff --git a/cinder/meta/collectd.yml b/cinder/meta/collectd.yml
index ec7c9dc..d0229c5 100644
--- a/cinder/meta/collectd.yml
+++ b/cinder/meta/collectd.yml
@@ -5,7 +5,7 @@
   collectd_check_local_endpoint:
     endpoint:
       cinder-api:
-        expected_code: 200
+        expected_code: {% if controller.version in ('juno', 'kilo', 'liberty') %}200{% else %}300{% endif %}
         url: "http://{{ controller.osapi.host|replace('0.0.0.0', '127.0.0.1') }}:8776/"
 remote_plugin:
   openstack_cinder: