Merge "Default collectd to overcloud gnocchi" into stable/queens

puppet/services/metrics/collectd.yaml

@@ -29,6 +29,14 @@ parameters:
     default: {}
     description: Parameters specific to the role
     type: json
+  GnocchiPassword:
+    type: string
+    description: The password for the gnocchi service and db account.
+    hidden: true
+  KeystoneRegion:
+    type: string
+    description: Keystone region for endpoint
+    default: 'regionOne'
   CollectdDefaultPlugins:
     default:
       - disk
@@ -96,7 +104,7 @@ parameters:
     description: >
       Type of authentication Gnocchi server is using. Supported values are
       'simple' and 'keystone'.
-    default: 'simple'
+    default: 'keystone'
   CollectdGnocchiProtocol:
     type: string
     description: API protocol Gnocchi server is using.
@@ -133,6 +141,7 @@ parameters:
     type: string
     description: Password for authenticating to Keystone
     default: nil
+    hidden: true
   CollectdGnocchiKeystoneProjectId:
     type: string
     description: Project ID for authenticating to Keystone.
@@ -183,11 +192,10 @@ parameters:
     default: 10
 
 conditions:
-  gnocchi_connection:
+  gnocchi_default_connection:
-    not:
+    and:
-      and:
+      - equals: [{get_param: CollectdGnocchiServer}, nil]
-        - equals: [{get_param: CollectdGnocchiServer}, nil]
+      - equals: [{get_param: CollectdGnocchiKeystoneEndpoint}, nil]
-        - equals: [{get_param: CollectdGnocchiKeystoneEndpoint}, nil]
   collectd_connection:
     not:
       equals: [{get_param: CollectdServer}, '']
@@ -215,7 +223,7 @@ outputs:
                   ($.data.default_plugins + $.data.extra_plugins)
                   .flatten().distinct()
           - if:
-            - collectd_connection
+            - collectd_connection # use server side collectd or gnocchi as metrics relay?
             - tripleo::profile::base::metrics::collectd::collectd_server:
                 get_param: CollectdServer
               tripleo::profile::base::metrics::collectd::collectd_port:
@@ -226,9 +234,6 @@ outputs:
                 get_param: CollectdPassword
               tripleo::profile::base::metrics::collectd::collectd_securitylevel:
                 get_param: CollectdSecurityLevel
-            - {}
-          - if:
-            - gnocchi_connection
             - map_merge:
               - tripleo::profile::base::metrics::collectd::gnocchi_auth_mode:
                   get_param: CollectdGnocchiAuthMode
@@ -237,42 +242,55 @@ outputs:
                 tripleo::profile::base::metrics::collectd::gnocchi_batch_size:
                   get_param: CollectdGnocchiBatchSize
               - if:
-                - gnocchi_auth_simple
+                - gnocchi_default_connection  # use overcloud gnocchi instance or user provided instance?
-                - tripleo::profile::base::metrics::collectd::gnocchi_protocol:
+                - tripleo::profile::base::metrics::collectd::gnocchi_keystone_endpoint:
-                    get_param: CollectdGnocchiProtocol
+                    get_param: [EndpointMap, GnocchiInternal, uri]
-                  tripleo::profile::base::metrics::collectd::gnocchi_server:
+                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_auth_url:
-                    get_param: CollectdGnocchiServer
+                    get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]
-                  tripleo::profile::base::metrics::collectd::gnocchi_port:
+                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_name: 'gnocchi'
-                    get_param: CollectdGnocchiPort
-                  tripleo::profile::base::metrics::collectd::gnocchi_user:
-                    get_param: CollectdGnocchiUser
-                - tripleo::profile::base::metrics::collectd::gnocchi_keystone_auth_url:
-                    get_param: CollectdGnocchiKeystoneAuthUrl
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_name:
-                    get_param: CollectdGnocchiKeystoneUserName
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_id:
-                    get_param: CollectdGnocchiKeystoneUserId
                   tripleo::profile::base::metrics::collectd::gnocchi_keystone_password:
-                    get_param: CollectdGnocchiKeystonePassword
+                    get_param: GnocchiPassword
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_id:
+                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_name: 'service'
-                    get_param: CollectdGnocchiKeystoneProjectId
+                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_domain_name: 'Default'
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_name:
+                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_domain_name: 'Default'
-                    get_param: CollectdGnocchiKeystoneProjectName
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_domain_id:
-                    get_param: CollectdGnocchiKeystoneUserDomainId
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_domain_name:
-                    get_param: CollectdGnocchiKeystoneUserDomainName
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_domain_id:
-                    get_param: CollectdGnocchiKeystoneProjectDomainId
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_domain_name:
-                    get_param: CollectdGnocchiKeystoneProjectDomainName
                   tripleo::profile::base::metrics::collectd::gnocchi_keystone_region_name:
-                    get_param: CollectdGnocchiKeystoneRegionName
+                    get_param: KeystoneRegion
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_interface:
+                - if:
-                    get_param: CollectdGnocchiKeystoneInterface
+                  - gnocchi_auth_simple # use simple auth or keystone auth?
-                  tripleo::profile::base::metrics::collectd::gnocchi_keystone_endpoint:
+                  - tripleo::profile::base::metrics::collectd::gnocchi_protocol:
-                    get_param: CollectdGnocchiKeystoneEndpoint
+                      get_param: CollectdGnocchiProtocol
-            - {}
+                    tripleo::profile::base::metrics::collectd::gnocchi_server:
+                      get_param: CollectdGnocchiServer
+                    tripleo::profile::base::metrics::collectd::gnocchi_port:
+                      get_param: CollectdGnocchiPort
+                    tripleo::profile::base::metrics::collectd::gnocchi_user:
+                      get_param: CollectdGnocchiUser
+                  - tripleo::profile::base::metrics::collectd::gnocchi_keystone_auth_url:
+                      get_param: CollectdGnocchiKeystoneAuthUrl
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_name:
+                      get_param: CollectdGnocchiKeystoneUserName
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_id:
+                      get_param: CollectdGnocchiKeystoneUserId
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_password:
+                      get_param: CollectdGnocchiKeystonePassword
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_id:
+                      get_param: CollectdGnocchiKeystoneProjectId
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_name:
+                      get_param: CollectdGnocchiKeystoneProjectName
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_domain_id:
+                      get_param: CollectdGnocchiKeystoneUserDomainId
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_user_domain_name:
+                      get_param: CollectdGnocchiKeystoneUserDomainName
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_domain_id:
+                      get_param: CollectdGnocchiKeystoneProjectDomainId
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_project_domain_name:
+                      get_param: CollectdGnocchiKeystoneProjectDomainName
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_region_name:
+                      get_param: CollectdGnocchiKeystoneRegionName
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_interface:
+                      get_param: CollectdGnocchiKeystoneInterface
+                    tripleo::profile::base::metrics::collectd::gnocchi_keystone_endpoint:
+                      get_param: CollectdGnocchiKeystoneEndpoint
       step_config: |
         include ::tripleo::profile::base::metrics::collectd
       upgrade_tasks:

releasenotes/notes/collectd-overcloud-gnocchi-049a63bbd196a9bb.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Makes collectd deployment default output metrics data to Gnocchi instance
+    running on overcloud nodes.