diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml
index e541e204e8..1ea720c2a2 100644
--- a/puppet/services/metrics/collectd.yaml
+++ b/puppet/services/metrics/collectd.yaml
@@ -112,7 +112,7 @@ parameters:
     type: string
     description: >
       Type of authentication Gnocchi server is using. Supported values are
-      'simple' and 'keystone'.
+      'basic' and 'keystone'.
     default: 'keystone'
   CollectdGnocchiProtocol:
     type: string
@@ -208,8 +208,8 @@ conditions:
   collectd_connection:
     not:
       equals: [{get_param: CollectdServer}, '']
-  gnocchi_auth_simple:
-    equals: [{get_param: CollectdGnocchiAuthMode}, 'simple']
+  gnocchi_auth_basic:
+    equals: [{get_param: CollectdGnocchiAuthMode}, 'basic']
 
 outputs:
   role_data:
@@ -268,7 +268,7 @@ outputs:
                   tripleo::profile::base::metrics::collectd::gnocchi_keystone_region_name:
                     get_param: KeystoneRegion
                 - if:
-                  - gnocchi_auth_simple # use simple auth or keystone auth?
+                  - gnocchi_auth_basic # use basic auth or keystone auth?
                   - tripleo::profile::base::metrics::collectd::gnocchi_protocol:
                       get_param: CollectdGnocchiProtocol
                     tripleo::profile::base::metrics::collectd::gnocchi_server: