Browse Source

Merge "QDR for metrics collection purposes" into stable/queens

tags/8.4.1
Zuul 1 month ago
parent
commit
e238f143bf
45 changed files with 281 additions and 7 deletions
  1. 3
    1
      ci/environments/scenario001-multinode-containers.yaml
  2. 2
    2
      docker/services/metrics/collectd.yaml
  3. 220
    0
      docker/services/metrics/qdr.yaml
  4. 1
    0
      environments/hyperconverged-ceph.yaml
  5. 1
    1
      environments/metrics/collectd-standalone.yaml
  6. 1
    1
      environments/services/collectd.yaml
  7. 1
    0
      network/service_net_map.j2.yaml
  8. 1
    0
      overcloud-resource-registry-puppet.j2.yaml
  9. 9
    0
      releasenotes/notes/metrics-qdr-97c00cc8059963fa.yaml
  10. 1
    0
      roles/BlockStorage.yaml
  11. 1
    0
      roles/CephAll.yaml
  12. 1
    0
      roles/CephFile.yaml
  13. 1
    0
      roles/CephObject.yaml
  14. 1
    0
      roles/CephStorage.yaml
  15. 1
    0
      roles/Compute.yaml
  16. 1
    0
      roles/ComputeDVR.yaml
  17. 1
    0
      roles/ComputeHCI.yaml
  18. 1
    0
      roles/ComputeHCIOvsDpdk.yaml
  19. 1
    0
      roles/ComputeInstanceHA.yaml
  20. 1
    0
      roles/ComputeLiquidio.yaml
  21. 1
    0
      roles/ComputeOvsDpdk.yaml
  22. 1
    0
      roles/ComputeOvsDpdkRT.yaml
  23. 1
    0
      roles/ComputeOvsDpdkSriov.yaml
  24. 1
    0
      roles/ComputeRealTime.yaml
  25. 1
    0
      roles/ComputeSriov.yaml
  26. 1
    0
      roles/ComputeSriovRT.yaml
  27. 1
    0
      roles/Controller.yaml
  28. 1
    0
      roles/ControllerAllNovaStandalone.yaml
  29. 1
    0
      roles/ControllerNoCeph.yaml
  30. 1
    0
      roles/ControllerNovaStandalone.yaml
  31. 1
    0
      roles/ControllerOpenstack.yaml
  32. 1
    0
      roles/ControllerStorageNfs.yaml
  33. 1
    0
      roles/Database.yaml
  34. 1
    0
      roles/HciCephAll.yaml
  35. 1
    0
      roles/HciCephFile.yaml
  36. 1
    0
      roles/HciCephMon.yaml
  37. 1
    0
      roles/HciCephObject.yaml
  38. 1
    0
      roles/IronicConductor.yaml
  39. 1
    1
      roles/Messaging.yaml
  40. 1
    0
      roles/Networker.yaml
  41. 1
    0
      roles/Novacontrol.yaml
  42. 1
    0
      roles/ObjectStorage.yaml
  43. 1
    0
      roles/Telemetry.yaml
  44. 5
    0
      roles_data.yaml
  45. 3
    1
      tools/yaml-validate.py

+ 3
- 1
ci/environments/scenario001-multinode-containers.yaml View File

@@ -6,7 +6,8 @@ resource_registry:
6 6
   OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
7 7
   OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
8 8
   OS::TripleO::Services::PankoApi: ../../docker/services/panko-api.yaml
9
-  OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
9
+  OS::TripleO::Services::Collectd: ../../docker/services/metrics/collectd.yaml
10
+  OS::TripleO::Services::MetricsQdr: ../../docker/services/metrics/qdr.yaml
10 11
   OS::TripleO::Services::RabbitMQ: ../../docker/services/pacemaker/rabbitmq.yaml
11 12
   OS::TripleO::Services::HAproxy: ../../docker/services/pacemaker/haproxy.yaml
12 13
   OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
@@ -86,6 +87,7 @@ parameter_defaults:
86 87
     - OS::TripleO::Services::CinderScheduler
87 88
     - OS::TripleO::Services::CinderVolume
88 89
     - OS::TripleO::Services::Collectd
90
+    - OS::TripleO::Services::MetricsQdr
89 91
     - OS::TripleO::Services::TripleoPackages
90 92
     - OS::TripleO::Services::TripleoFirewall
91 93
     - OS::TripleO::Services::Fluentd

docker/services/collectd.yaml → docker/services/metrics/collectd.yaml View File

@@ -44,10 +44,10 @@ parameters:
44 44
 resources:
45 45
 
46 46
   ContainersCommon:
47
-    type: ./containers-common.yaml
47
+    type: ../containers-common.yaml
48 48
 
49 49
   CollectdBase:
50
-    type: ../../puppet/services/metrics/collectd.yaml
50
+    type: ../../../puppet/services/metrics/collectd.yaml
51 51
     properties:
52 52
       EndpointMap: {get_param: EndpointMap}
53 53
       ServiceData: {get_param: ServiceData}

+ 220
- 0
docker/services/metrics/qdr.yaml View File

@@ -0,0 +1,220 @@
1
+heat_template_version: queens
2
+
3
+description: >
4
+  Qpid dispatch router service for metrics and monitoring purposes
5
+
6
+parameters:
7
+  DockerMetricsQdrImage:
8
+    description: image
9
+    type: string
10
+  DockerMetricsQdrConfigImage:
11
+    description: The container image to use for the qdrouterd config_volume
12
+    type: string
13
+  ServiceData:
14
+    default: {}
15
+    description: Dictionary packing service data
16
+    type: json
17
+  ServiceNetMap:
18
+    default: {}
19
+    description: Mapping of service_name -> network name. Typically set
20
+                 via parameter_defaults in the resource registry.  This
21
+                 mapping overrides those in ServiceNetMapDefaults.
22
+    type: json
23
+  DefaultPasswords:
24
+    default: {}
25
+    type: json
26
+  RoleName:
27
+    default: ''
28
+    description: Role name on which the service is applied
29
+    type: string
30
+  RoleParameters:
31
+    default: {}
32
+    description: Parameters specific to the role
33
+    type: json
34
+  EndpointMap:
35
+    default: {}
36
+    description: Mapping of service endpoint -> protocol. Typically set
37
+                 via parameter_defaults in the resource registry.
38
+    type: json
39
+  MonitoringSubscriptionQdr:
40
+    default: 'overcloud-qdr'
41
+    type: string
42
+  MetricsQdrLoggingSource:
43
+    type: json
44
+    default:
45
+      tag: openstack.nova.consoleauth
46
+      path: /var/log/qdrouterd/metrics-qdr.log
47
+  MetricsQdrPort:
48
+    default: '5666'
49
+    description: Service name or port number on which the qdrouterd will accept
50
+                 connections. This argument must be string, even if the numeric
51
+                 form is used.
52
+    type: string
53
+  MetricsQdrUsername:
54
+    default: 'guest'
55
+    description: Username which should be used to authenticate to the deployed
56
+                 qdrouterd.
57
+    type: string
58
+  MetricsQdrPassword:
59
+    default: 'guest'
60
+    description: Password which should be used to authenticate to the deployed
61
+                 qdrouterd.
62
+    type: string
63
+    hidden: true
64
+  MetricsQdrConnectors:
65
+    default: []
66
+    description: Connectors configuration (array of hashes).
67
+    type: json
68
+  MetricsQdrAddresses:
69
+    default:
70
+      - prefix: 'collectd/notify'
71
+        distribution: multicast
72
+      - prefix: 'collectd/telemetry'
73
+        distribution: multicast
74
+    description: Addresses configuration (array of hashes).
75
+    type: json
76
+  MetricsQdrUseSSL:
77
+    default: false
78
+    description: Set to true if it is required to use SSL or TLS on
79
+                 the connection for listener.
80
+    type: boolean
81
+  MetricsQdrUseEncryption:
82
+    default: false
83
+    description: Set to true if it is required to encrypt connection to the peer
84
+                 for listener.
85
+    type: boolean
86
+  MetricsQdrSaslMechanisms:
87
+    default: 'ANONYMOUS'
88
+    description: List of accepted SASL auth mechanisms for listener in format
89
+                 of comma separated list.
90
+    type: string
91
+  MetricsQdrSslCertDb:
92
+    default: ''
93
+    description: Path to SSL certificate db for listener.
94
+    type: string
95
+  MetricsQdrSslCertFile:
96
+    default: ''
97
+    description: Path to SSL certificate file for listener.
98
+    type: string
99
+  MetricsQdrSslKeyFile:
100
+    default: ''
101
+    description: Path to SSL private key file for listener.
102
+    type: string
103
+  MetricsQdrSslPwFile:
104
+    default: ''
105
+    description: Path to SSL password file for certificate key for listener.
106
+    type: string
107
+  MetricsQdrSslPassword:
108
+    default: ''
109
+    description: SSL password to be supplied for listener.
110
+    type: string
111
+  MetricsQdrTrustedCerts:
112
+    default: ''
113
+    description: Path to file containing trusted certificates for listener.
114
+    type: string
115
+
116
+
117
+resources:
118
+  ContainersCommon:
119
+    type: ../containers-common.yaml
120
+
121
+
122
+outputs:
123
+  role_data:
124
+    description: Role data for the metrics Qdr role.
125
+    value:
126
+      service_name: metrics-qdr
127
+      monitoring_subscription: {get_param: MonitoringSubscriptionQdr}
128
+      service_config_settings:
129
+        fluentd:
130
+          tripleo_fluentd_groups_metrics_qdr:
131
+            - qdr
132
+          tripleo_fluentd_sources_metrics_qdr:
133
+            - {get_param: MetricsQdrLoggingSource}
134
+      config_settings:
135
+        tripleo.metrics_qdr.firewall_rules:
136
+          '109 metrics qdr':
137
+            dport:
138
+              - {get_param: MetricsQdrPort}
139
+        tripleo::profile::base::metrics::qdr::listener_addr:
140
+          str_replace:
141
+             template:
142
+               "%{hiera('$NETWORK')}"
143
+             params:
144
+               $NETWORK: {get_param: [ServiceNetMap, MetricsQdrNetwork]}
145
+        tripleo::profile::base::metrics::qdr::listener_port: {get_param: MetricsQdrPort}
146
+        tripleo::profile::base::metrics::qdr::username: {get_param: MetricsQdrUsername}
147
+        tripleo::profile::base::metrics::qdr::password: {get_param: MetricsQdrPassword}
148
+        tripleo::profile::base::metrics::qdr::connectors: {get_param: MetricsQdrConnectors}
149
+        tripleo::profile::base::metrics::qdr::addresses: {get_param: MetricsQdrAddresses}
150
+        # ssl support
151
+        tripleo::profile::base::metrics::qdr::listener_require_ssl: {get_param: MetricsQdrUseSSL}
152
+        tripleo::profile::base::metrics::qdr::listener_require_encrypt: {get_param: MetricsQdrUseEncryption}
153
+        tripleo::profile::base::metrics::qdr::listener_sasl_mech: {get_param: MetricsQdrSaslMechanisms}
154
+        tripleo::profile::base::metrics::qdr::listener_ssl_cert_db: {get_param: MetricsQdrSslCertDb}
155
+        tripleo::profile::base::metrics::qdr::listener_ssl_cert_file: {get_param: MetricsQdrSslCertFile}
156
+        tripleo::profile::base::metrics::qdr::listener_ssl_key_file: {get_param: MetricsQdrSslKeyFile}
157
+        tripleo::profile::base::metrics::qdr::listener_ssl_pw_file: {get_param: MetricsQdrSslPwFile}
158
+        tripleo::profile::base::metrics::qdr::listener_ssl_password: {get_param: MetricsQdrSslPassword}
159
+        tripleo::profile::base::metrics::qdr::listener_trusted_certs: {get_param: MetricsQdrTrustedCerts}
160
+      # BEGIN DOCKER SETTINGS
161
+      puppet_config:
162
+        config_volume: metrics-qdr
163
+        step_config: |
164
+          include ::tripleo::profile::base::metrics::qdr
165
+        config_image: {get_param: DockerMetricsQdrConfigImage}
166
+      kolla_config:
167
+        /var/lib/kolla/config_files/metrics-qdr.json:
168
+          command: /usr/sbin/qdrouterd -c /etc/qpid-dispatch/qdrouterd.conf
169
+          config_files:
170
+            - source: "/var/lib/kolla/config_files/src/*"
171
+              dest: "/"
172
+              merge: true
173
+              preserve_properties: true
174
+          permissions:
175
+            - path: /var/lib/qdrouterd
176
+              owner: qdrouterd:qdrouterd
177
+              recurse: true
178
+      docker_config:
179
+        step_1:
180
+          metrics_qdr_init_logs:
181
+            start_order: 0
182
+            detach: false
183
+            image: &qdrouterd_image {get_param: DockerMetricsQdrImage}
184
+            privileged: false
185
+            user: root
186
+            volumes:
187
+              - /var/log/containers/metrics-qdr:/var/log/qdrouterd
188
+            command: ['/bin/bash', '-c', 'chown -R qdrouterd:qdrouterd /var/log/qdrouterd']
189
+          metrics_qdr:
190
+            start_order: 1
191
+            image: *qdrouterd_image
192
+            net: host
193
+            user: qdrouterd
194
+            privileged: false
195
+            restart: always
196
+            volumes:
197
+              list_concat:
198
+                - {get_attr: [ContainersCommon, volumes]}
199
+                -
200
+                  - /var/lib/kolla/config_files/metrics-qdr.json:/var/lib/kolla/config_files/config.json:ro
201
+                  - /var/lib/config-data/puppet-generated/metrics-qdr/:/var/lib/kolla/config_files/src:ro
202
+                  - /var/lib/metrics-qdr:/var/lib/qdrouterd
203
+                  - /var/log/containers/metrics-qdr:/var/log/qdrouterd
204
+            environment:
205
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
206
+      host_prep_tasks:
207
+        - name: create persistent logs directory
208
+          file:
209
+            path: "{{ item }}"
210
+            state: directory
211
+          with_items:
212
+            - /var/log/containers/metrics-qdr
213
+            - /var/lib/metrics-qdr
214
+        - name: qrouterd logs readme
215
+          copy:
216
+            dest: /var/log/qrouterd/readme-metrics.txt
217
+            content: |
218
+              Log files from metrics qrouterd containers can be found under
219
+              /var/log/containers/metrics-qdr.
220
+          ignore_errors: true

+ 1
- 0
environments/hyperconverged-ceph.yaml View File

@@ -48,6 +48,7 @@ parameter_defaults:
48 48
     - OS::TripleO::Services::Ipsec
49 49
     - OS::TripleO::Services::AuditD
50 50
     - OS::TripleO::Services::Collectd
51
+    - OS::TripleO::Services::MetricsQdr
51 52
     - OS::TripleO::Services::CephOSD
52 53
     - OS::TripleO::Services::Vpp
53 54
     - OS::TripleO::Services::NeutronVppAgent

+ 1
- 1
environments/metrics/collectd-standalone.yaml View File

@@ -1,5 +1,5 @@
1 1
 resource_registry:
2
-  OS::TripleO::Services::Collectd: ../docker/services/collectd.yaml
2
+  OS::TripleO::Services::Collectd: ../docker/services/metrics/collectd.yaml
3 3
 
4 4
 # parameter_defaults:
5 5
 #

+ 1
- 1
environments/services/collectd.yaml View File

@@ -1,2 +1,2 @@
1 1
 resource_registry:
2
-  OS::TripleO::Services::Collectd: ../../docker/services/collectd.yaml
2
+  OS::TripleO::Services::Collectd: ../../docker/services/metrics/collectd.yaml

+ 1
- 0
network/service_net_map.j2.yaml View File

@@ -42,6 +42,7 @@ parameters:
42 42
       KeystoneAdminApiNetwork: ctlplane # allows undercloud to config endpoints
43 43
       KeystonePublicApiNetwork: internal_api
44 44
       ManilaApiNetwork: internal_api
45
+      MetricsQdrNetwork: internal_api
45 46
       NeutronApiNetwork: internal_api
46 47
       OctaviaApiNetwork: internal_api
47 48
       HeatApiNetwork: internal_api

+ 1
- 0
overcloud-resource-registry-puppet.j2.yaml View File

@@ -293,6 +293,7 @@ resource_registry:
293 293
   OS::TripleO::Services::UndercloudAodhListener: OS::Heat::None
294 294
   OS::TripleO::Services::PankoApi: docker/services/panko-api.yaml
295 295
   OS::TripleO::Services::UndercloudPankoApi: OS::Heat::None
296
+  OS::TripleO::Services::MetricsQdr: OS::Heat::None
296 297
   OS::TripleO::Services::MistralEngine: OS::Heat::None
297 298
   OS::TripleO::Services::MistralApi: OS::Heat::None
298 299
   OS::TripleO::Services::MistralExecutor: OS::Heat::None

+ 9
- 0
releasenotes/notes/metrics-qdr-97c00cc8059963fa.yaml View File

@@ -0,0 +1,9 @@
1
+---
2
+
3
+features:
4
+  - |
5
+    Added new composable service (QDR) for containerized deployments. Metrics
6
+    QDR will run on each overcloud node in 'edge' mode. This basically means
7
+    that there is a possibility there will be two QDRs running on controllers
8
+    in case that oslo messaging is deployed. This is a reason why we need
9
+    separate composable service for this use case.

+ 1
- 0
roles/BlockStorage.yaml View File

@@ -26,6 +26,7 @@
26 26
     - OS::TripleO::Services::Iscsid
27 27
     - OS::TripleO::Services::Kernel
28 28
     - OS::TripleO::Services::LoginDefs
29
+    - OS::TripleO::Services::MetricsQdr
29 30
     - OS::TripleO::Services::MySQLClient
30 31
     - OS::TripleO::Services::Ntp
31 32
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/CephAll.yaml View File

@@ -29,6 +29,7 @@
29 29
     - OS::TripleO::Services::Ipsec
30 30
     - OS::TripleO::Services::Kernel
31 31
     - OS::TripleO::Services::LoginDefs
32
+    - OS::TripleO::Services::MetricsQdr
32 33
     - OS::TripleO::Services::MySQLClient
33 34
     - OS::TripleO::Services::Ntp
34 35
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/CephFile.yaml View File

@@ -25,6 +25,7 @@
25 25
     - OS::TripleO::Services::Ipsec
26 26
     - OS::TripleO::Services::Kernel
27 27
     - OS::TripleO::Services::LoginDefs
28
+    - OS::TripleO::Services::MetricsQdr
28 29
     - OS::TripleO::Services::MySQLClient
29 30
     - OS::TripleO::Services::Ntp
30 31
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/CephObject.yaml View File

@@ -25,6 +25,7 @@
25 25
     - OS::TripleO::Services::Ipsec
26 26
     - OS::TripleO::Services::Kernel
27 27
     - OS::TripleO::Services::LoginDefs
28
+    - OS::TripleO::Services::MetricsQdr
28 29
     - OS::TripleO::Services::MySQLClient
29 30
     - OS::TripleO::Services::Ntp
30 31
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/CephStorage.yaml View File

@@ -24,6 +24,7 @@
24 24
     - OS::TripleO::Services::Ipsec
25 25
     - OS::TripleO::Services::Kernel
26 26
     - OS::TripleO::Services::LoginDefs
27
+    - OS::TripleO::Services::MetricsQdr
27 28
     - OS::TripleO::Services::MySQLClient
28 29
     - OS::TripleO::Services::Ntp
29 30
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/Compute.yaml View File

@@ -44,6 +44,7 @@
44 44
     - OS::TripleO::Services::Iscsid
45 45
     - OS::TripleO::Services::Kernel
46 46
     - OS::TripleO::Services::LoginDefs
47
+    - OS::TripleO::Services::MetricsQdr
47 48
     - OS::TripleO::Services::MySQLClient
48 49
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
49 50
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/ComputeDVR.yaml View File

@@ -34,6 +34,7 @@
34 34
     - OS::TripleO::Services::Iscsid
35 35
     - OS::TripleO::Services::Kernel
36 36
     - OS::TripleO::Services::LoginDefs
37
+    - OS::TripleO::Services::MetricsQdr
37 38
     - OS::TripleO::Services::MySQLClient
38 39
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
39 40
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/ComputeHCI.yaml View File

@@ -35,6 +35,7 @@
35 35
     - OS::TripleO::Services::Iscsid
36 36
     - OS::TripleO::Services::Kernel
37 37
     - OS::TripleO::Services::LoginDefs
38
+    - OS::TripleO::Services::MetricsQdr
38 39
     - OS::TripleO::Services::MySQLClient
39 40
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
40 41
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/ComputeHCIOvsDpdk.yaml View File

@@ -39,6 +39,7 @@
39 39
     - OS::TripleO::Services::Iscsid
40 40
     - OS::TripleO::Services::Kernel
41 41
     - OS::TripleO::Services::LoginDefs
42
+    - OS::TripleO::Services::MetricsQdr
42 43
     - OS::TripleO::Services::MySQLClient
43 44
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
44 45
     - OS::TripleO::Services::NovaCompute

+ 1
- 0
roles/ComputeInstanceHA.yaml View File

@@ -35,6 +35,7 @@
35 35
     - OS::TripleO::Services::Iscsid
36 36
     - OS::TripleO::Services::Kernel
37 37
     - OS::TripleO::Services::LoginDefs
38
+    - OS::TripleO::Services::MetricsQdr
38 39
     - OS::TripleO::Services::MySQLClient
39 40
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
40 41
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/ComputeLiquidio.yaml View File

@@ -35,6 +35,7 @@
35 35
     - OS::TripleO::Services::Iscsid
36 36
     - OS::TripleO::Services::Kernel
37 37
     - OS::TripleO::Services::LoginDefs
38
+    - OS::TripleO::Services::MetricsQdr
38 39
     - OS::TripleO::Services::MySQLClient
39 40
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
40 41
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/ComputeOvsDpdk.yaml View File

@@ -39,6 +39,7 @@
39 39
     - OS::TripleO::Services::Iscsid
40 40
     - OS::TripleO::Services::Kernel
41 41
     - OS::TripleO::Services::LoginDefs
42
+    - OS::TripleO::Services::MetricsQdr
42 43
     - OS::TripleO::Services::MySQLClient
43 44
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
44 45
     - OS::TripleO::Services::NovaCompute

+ 1
- 0
roles/ComputeOvsDpdkRT.yaml View File

@@ -40,6 +40,7 @@
40 40
     - OS::TripleO::Services::Iscsid
41 41
     - OS::TripleO::Services::Kernel
42 42
     - OS::TripleO::Services::LoginDefs
43
+    - OS::TripleO::Services::MetricsQdr
43 44
     - OS::TripleO::Services::MySQLClient
44 45
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
45 46
     - OS::TripleO::Services::NovaCompute

+ 1
- 0
roles/ComputeOvsDpdkSriov.yaml View File

@@ -36,6 +36,7 @@
36 36
     - OS::TripleO::Services::Iscsid
37 37
     - OS::TripleO::Services::Kernel
38 38
     - OS::TripleO::Services::LoginDefs
39
+    - OS::TripleO::Services::MetricsQdr
39 40
     - OS::TripleO::Services::MySQLClient
40 41
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
41 42
     - OS::TripleO::Services::NeutronSriovAgent

+ 1
- 0
roles/ComputeRealTime.yaml View File

@@ -43,6 +43,7 @@
43 43
     - OS::TripleO::Services::Iscsid
44 44
     - OS::TripleO::Services::Kernel
45 45
     - OS::TripleO::Services::LoginDefs
46
+    - OS::TripleO::Services::MetricsQdr
46 47
     - OS::TripleO::Services::MySQLClient
47 48
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
48 49
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/ComputeSriov.yaml View File

@@ -35,6 +35,7 @@
35 35
     - OS::TripleO::Services::Iscsid
36 36
     - OS::TripleO::Services::Kernel
37 37
     - OS::TripleO::Services::LoginDefs
38
+    - OS::TripleO::Services::MetricsQdr
38 39
     - OS::TripleO::Services::MySQLClient
39 40
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
40 41
     - OS::TripleO::Services::NeutronSriovAgent

+ 1
- 0
roles/ComputeSriovRT.yaml View File

@@ -37,6 +37,7 @@
37 37
     - OS::TripleO::Services::Iscsid
38 38
     - OS::TripleO::Services::Kernel
39 39
     - OS::TripleO::Services::LoginDefs
40
+    - OS::TripleO::Services::MetricsQdr
40 41
     - OS::TripleO::Services::MySQLClient
41 42
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
42 43
     - OS::TripleO::Services::NeutronSriovAgent

+ 1
- 0
roles/Controller.yaml View File

@@ -106,6 +106,7 @@
106 106
     - OS::TripleO::Services::ManilaScheduler
107 107
     - OS::TripleO::Services::ManilaShare
108 108
     - OS::TripleO::Services::Memcached
109
+    - OS::TripleO::Services::MetricsQdr
109 110
     - OS::TripleO::Services::MistralApi
110 111
     - OS::TripleO::Services::MistralEngine
111 112
     - OS::TripleO::Services::MistralExecutor

+ 1
- 0
roles/ControllerAllNovaStandalone.yaml View File

@@ -45,6 +45,7 @@
45 45
     - OS::TripleO::Services::CinderScheduler
46 46
     - OS::TripleO::Services::CinderVolume
47 47
     - OS::TripleO::Services::Collectd
48
+    - OS::TripleO::Services::MetricsQdr
48 49
     - OS::TripleO::Services::Congress
49 50
     - OS::TripleO::Services::Docker
50 51
     - OS::TripleO::Services::Etcd

+ 1
- 0
roles/ControllerNoCeph.yaml View File

@@ -99,6 +99,7 @@
99 99
     - OS::TripleO::Services::ManilaScheduler
100 100
     - OS::TripleO::Services::ManilaShare
101 101
     - OS::TripleO::Services::Memcached
102
+    - OS::TripleO::Services::MetricsQdr
102 103
     - OS::TripleO::Services::MistralApi
103 104
     - OS::TripleO::Services::MistralEngine
104 105
     - OS::TripleO::Services::MistralExecutor

+ 1
- 0
roles/ControllerNovaStandalone.yaml View File

@@ -90,6 +90,7 @@
90 90
     - OS::TripleO::Services::ManilaScheduler
91 91
     - OS::TripleO::Services::ManilaShare
92 92
     - OS::TripleO::Services::Memcached
93
+    - OS::TripleO::Services::MetricsQdr
93 94
     - OS::TripleO::Services::MistralApi
94 95
     - OS::TripleO::Services::MistralEngine
95 96
     - OS::TripleO::Services::MistralExecutor

+ 1
- 0
roles/ControllerOpenstack.yaml View File

@@ -84,6 +84,7 @@
84 84
     - OS::TripleO::Services::ManilaBackendVMAX
85 85
     - OS::TripleO::Services::ManilaScheduler
86 86
     - OS::TripleO::Services::ManilaShare
87
+    - OS::TripleO::Services::MetricsQdr
87 88
     - OS::TripleO::Services::Memcached
88 89
     - OS::TripleO::Services::MistralApi
89 90
     - OS::TripleO::Services::MistralEngine

+ 1
- 0
roles/ControllerStorageNfs.yaml View File

@@ -103,6 +103,7 @@
103 103
     - OS::TripleO::Services::ManilaScheduler
104 104
     - OS::TripleO::Services::ManilaShare
105 105
     - OS::TripleO::Services::Memcached
106
+    - OS::TripleO::Services::MetricsQdr
106 107
     - OS::TripleO::Services::MongoDb
107 108
     - OS::TripleO::Services::MySQL
108 109
     - OS::TripleO::Services::MySQLClient

+ 1
- 0
roles/Database.yaml View File

@@ -21,6 +21,7 @@
21 21
     - OS::TripleO::Services::Ipsec
22 22
     - OS::TripleO::Services::Kernel
23 23
     - OS::TripleO::Services::LoginDefs
24
+    - OS::TripleO::Services::MetricsQdr
24 25
     - OS::TripleO::Services::MySQL
25 26
     - OS::TripleO::Services::MySQLClient
26 27
     - OS::TripleO::Services::Ntp

+ 1
- 0
roles/HciCephAll.yaml View File

@@ -41,6 +41,7 @@
41 41
     - OS::TripleO::Services::Iscsid
42 42
     - OS::TripleO::Services::Kernel
43 43
     - OS::TripleO::Services::LoginDefs
44
+    - OS::TripleO::Services::MetricsQdr
44 45
     - OS::TripleO::Services::MySQLClient
45 46
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
46 47
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/HciCephFile.yaml View File

@@ -37,6 +37,7 @@
37 37
     - OS::TripleO::Services::Iscsid
38 38
     - OS::TripleO::Services::Kernel
39 39
     - OS::TripleO::Services::LoginDefs
40
+    - OS::TripleO::Services::MetricsQdr
40 41
     - OS::TripleO::Services::MySQLClient
41 42
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
42 43
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/HciCephMon.yaml View File

@@ -38,6 +38,7 @@
38 38
     - OS::TripleO::Services::Iscsid
39 39
     - OS::TripleO::Services::Kernel
40 40
     - OS::TripleO::Services::LoginDefs
41
+    - OS::TripleO::Services::MetricsQdr
41 42
     - OS::TripleO::Services::MySQLClient
42 43
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
43 44
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/HciCephObject.yaml View File

@@ -37,6 +37,7 @@
37 37
     - OS::TripleO::Services::Iscsid
38 38
     - OS::TripleO::Services::Kernel
39 39
     - OS::TripleO::Services::LoginDefs
40
+    - OS::TripleO::Services::MetricsQdr
40 41
     - OS::TripleO::Services::MySQLClient
41 42
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
42 43
     - OS::TripleO::Services::NeutronLinuxbridgeAgent

+ 1
- 0
roles/IronicConductor.yaml View File

@@ -23,6 +23,7 @@
23 23
     - OS::TripleO::Services::IronicPxe
24 24
     - OS::TripleO::Services::Kernel
25 25
     - OS::TripleO::Services::LoginDefs
26
+    - OS::TripleO::Services::MetricsQdr
26 27
     - OS::TripleO::Services::MySQLClient
27 28
     - OS::TripleO::Services::Ntp
28 29
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 1
roles/Messaging.yaml View File

@@ -20,6 +20,7 @@
20 20
     - OS::TripleO::Services::Ipsec
21 21
     - OS::TripleO::Services::Kernel
22 22
     - OS::TripleO::Services::LoginDefs
23
+    - OS::TripleO::Services::MetricsQdr
23 24
     - OS::TripleO::Services::Ntp
24 25
     - OS::TripleO::Services::ContainersLogrotateCrond
25 26
     - OS::TripleO::Services::Pacemaker
@@ -31,4 +32,3 @@
31 32
     - OS::TripleO::Services::TripleoFirewall
32 33
     - OS::TripleO::Services::TripleoPackages
33 34
     - OS::TripleO::Services::Tuned
34
-

+ 1
- 0
roles/Networker.yaml View File

@@ -21,6 +21,7 @@
21 21
     - OS::TripleO::Services::Ipsec
22 22
     - OS::TripleO::Services::Kernel
23 23
     - OS::TripleO::Services::LoginDefs
24
+    - OS::TripleO::Services::MetricsQdr
24 25
     - OS::TripleO::Services::MySQLClient
25 26
     - OS::TripleO::Services::NeutronDhcpAgent
26 27
     - OS::TripleO::Services::NeutronL2gwAgent

+ 1
- 0
roles/Novacontrol.yaml View File

@@ -20,6 +20,7 @@
20 20
     - OS::TripleO::Services::Ipsec
21 21
     - OS::TripleO::Services::Kernel
22 22
     - OS::TripleO::Services::LoginDefs
23
+    - OS::TripleO::Services::MetricsQdr
23 24
     - OS::TripleO::Services::MySQLClient
24 25
     - OS::TripleO::Services::NovaApi
25 26
     - OS::TripleO::Services::NovaConductor

+ 1
- 0
roles/ObjectStorage.yaml View File

@@ -30,6 +30,7 @@
30 30
     - OS::TripleO::Services::Ipsec
31 31
     - OS::TripleO::Services::Kernel
32 32
     - OS::TripleO::Services::LoginDefs
33
+    - OS::TripleO::Services::MetricsQdr
33 34
     - OS::TripleO::Services::MySQLClient
34 35
     - OS::TripleO::Services::Ntp
35 36
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 1
- 0
roles/Telemetry.yaml View File

@@ -33,6 +33,7 @@
33 33
     - OS::TripleO::Services::Ipsec
34 34
     - OS::TripleO::Services::Kernel
35 35
     - OS::TripleO::Services::LoginDefs
36
+    - OS::TripleO::Services::MetricsQdr
36 37
     - OS::TripleO::Services::MySQLClient
37 38
     - OS::TripleO::Services::Ntp
38 39
     - OS::TripleO::Services::Pacemaker

+ 5
- 0
roles_data.yaml View File

@@ -109,6 +109,7 @@
109 109
     - OS::TripleO::Services::ManilaScheduler
110 110
     - OS::TripleO::Services::ManilaShare
111 111
     - OS::TripleO::Services::Memcached
112
+    - OS::TripleO::Services::MetricsQdr
112 113
     - OS::TripleO::Services::MistralApi
113 114
     - OS::TripleO::Services::MistralEngine
114 115
     - OS::TripleO::Services::MistralExecutor
@@ -223,6 +224,7 @@
223 224
     - OS::TripleO::Services::Iscsid
224 225
     - OS::TripleO::Services::Kernel
225 226
     - OS::TripleO::Services::LoginDefs
227
+    - OS::TripleO::Services::MetricsQdr
226 228
     - OS::TripleO::Services::MySQLClient
227 229
     - OS::TripleO::Services::NeutronBgpVpnBagpipe
228 230
     - OS::TripleO::Services::NeutronLinuxbridgeAgent
@@ -277,6 +279,7 @@
277 279
     - OS::TripleO::Services::Iscsid
278 280
     - OS::TripleO::Services::Kernel
279 281
     - OS::TripleO::Services::LoginDefs
282
+    - OS::TripleO::Services::MetricsQdr
280 283
     - OS::TripleO::Services::MySQLClient
281 284
     - OS::TripleO::Services::Ntp
282 285
     - OS::TripleO::Services::ContainersLogrotateCrond
@@ -323,6 +326,7 @@
323 326
     - OS::TripleO::Services::Ipsec
324 327
     - OS::TripleO::Services::Kernel
325 328
     - OS::TripleO::Services::LoginDefs
329
+    - OS::TripleO::Services::MetricsQdr
326 330
     - OS::TripleO::Services::MySQLClient
327 331
     - OS::TripleO::Services::Ntp
328 332
     - OS::TripleO::Services::ContainersLogrotateCrond
@@ -365,6 +369,7 @@
365 369
     - OS::TripleO::Services::Ipsec
366 370
     - OS::TripleO::Services::Kernel
367 371
     - OS::TripleO::Services::LoginDefs
372
+    - OS::TripleO::Services::MetricsQdr
368 373
     - OS::TripleO::Services::MySQLClient
369 374
     - OS::TripleO::Services::Ntp
370 375
     - OS::TripleO::Services::ContainersLogrotateCrond

+ 3
- 1
tools/yaml-validate.py View File

@@ -53,7 +53,8 @@ OPTIONAL_DOCKER_SECTIONS = ['docker_puppet_tasks', 'upgrade_tasks',
53 53
                             'kolla_config', 'global_config_settings',
54 54
                             'logging_source', 'logging_groups',
55 55
                             'external_deploy_tasks', 'external_post_deploy_tasks',
56
-                            'docker_config_scripts', 'step_config']
56
+                            'docker_config_scripts', 'step_config',
57
+                            'monitoring_subscription']
57 58
 # ansible tasks cannot be an empty dict or ansible is unhappy
58 59
 ANSIBLE_TASKS_SECTIONS = ['upgrade_tasks', 'pre_upgrade_rolling_tasks',
59 60
                           'fast_forward_upgrade_tasks',
@@ -155,6 +156,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
155 156
 PREFERRED_CAMEL_CASE = {
156 157
     'ec2api': 'Ec2Api',
157 158
     'haproxy': 'HAProxy',
159
+    'metrics-qdr': 'MetricsQdr'
158 160
 }
159 161
 
160 162
 # Overrides for docker/puppet validation

Loading…
Cancel
Save