Add new images for ceph dashboard composable service.

This review adds the grafana, prometheus, alertmanager
and node-exporter images to make them available as
parameters in the tht template. This also covers the
password generation for tht templates.

Depends-on: https://review.opendev.org/#/c/667837
Change-Id: I2927240638ad1a1d43450e2d94771436e2775637

container-images/container_image_prepare_defaults.yaml

@@ -29,6 +29,22 @@ parameter_defaults:
       ceph_image: daemon
       ceph_tag: v4.0.0-stable-4.0-nautilus-centos-7-x86_64
 
+      ceph_prometheus_namespace: docker.io/prom
+      ceph_prometheus_image: prometheus
+      ceph_prometheus_tag: latest
+
+      ceph_alertmanager_namespace: docker.io/prom
+      ceph_alertmanager_image: alertmanager
+      ceph_alertmanager_tag: latest
+
+      ceph_node_exporter_namespace: docker.io/prom
+      ceph_node_exporter_image: node-exporter
+      ceph_node_exporter_tag: latest
+
+      ceph_grafana_namespace: docker.io/grafana
+      ceph_grafana_image: grafana
+      ceph_grafana_tag: latest
+
       # Container image name components for OpenShift images.
       # Only used if OpenShift is deployed.
       openshift_namespace: docker.io/openshift

container-images/overcloud_containers.yaml

@@ -199,6 +199,14 @@ container_images:
   image_source: kolla
 - imagename: docker.io/ceph/daemon:v4.0.0-stable-4.0-nautilus-centos-7-x86_64
   image_source: ceph
+- imagename: docker.io/prom/prometheus:latest
+  image_source: prom
+- imagename: docker.io/prom/alertmanager:latest
+  image_source: prom
+- imagename: docker.io/prom/node-exporter:latest
+  image_source: prom
+- imagename: docker.io/grafana/grafana:latest
+  image_source: grafana
 - imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
   image_source: kolla
 - imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo

container-images/overcloud_containers.yaml.j2

@@ -870,6 +870,34 @@ container_images_template:
   - OS::TripleO::Services::CephRgw
   - OS::TripleO::Services::CephRbdMirror
 
+- imagename: "{{ceph_prometheus_namespace}}/{{ceph_prometheus_image}}:{{ceph_prometheus_tag}}"
+  image_source: prom
+  params:
+  - PrometheusContainerImage
+  services:
+  - OS::TripleO::Services::CephGrafana
+
+- imagename: "{{ceph_alertmanager_namespace}}/{{ceph_alertmanager_image}}:{{ceph_alertmanager_tag}}"
+  image_source: prom
+  params:
+  - AlertManagerContainerImage
+  services:
+  - OS::TripleO::Services::CephGrafana
+
+- imagename: "{{ceph_node_exporter_namespace}}/{{ceph_node_exporter_image}}:{{ceph_node_exporter_tag}}"
+  image_source: prom
+  params:
+  - NodeExporterContainerImage
+  services:
+  - OS::TripleO::Services::CephGrafana
+
+- imagename: "{{ceph_grafana_namespace}}/{{ceph_grafana_image}}:{{ceph_grafana_tag}}"
+  image_source: grafana
+  params:
+  - GrafanaContainerImage
+  services:
+  - OS::TripleO::Services::CephGrafana
+
 - imagename: "{{namespace}}/{{name_prefix}}tempest{{name_suffix}}:{{tag}}"
   image_source: kolla
   params:

tripleo_common/constants.py

@@ -88,6 +88,8 @@ PASSWORD_PARAMETER_NAMES = (
     'CephManilaClientKey',
     'CephMonKey',
     'CephRgwKey',
+    'CephGrafanaAdminPassword',
+    'CephDashboardAdminPassword',
     'CinderPassword',
     'CongressPassword',
     'DesignatePassword',

tripleo_common/inventory.py

@@ -297,7 +297,8 @@ class TripleoInventory(object):
             'ceph_mds': 'mdss',
             'ceph_nfs': 'nfss',
             'ceph_client': 'clients',
-            'ceph_rbdmirror': 'rbdmirrors'
+            'ceph_rbdmirror': 'rbdmirrors',
+            'ceph_grafana-server': 'grafana-server'
         }
         # add a ceph-ansible compatible group to the inventory
         # which has the same roles. E.g. if the inventory has

tripleo_common/tests/actions/test_parameters.py

@@ -67,6 +67,8 @@ _EXISTING_PASSWORDS = {
     'CephMdsKey': b'AQCQXtlXAAAAABAAT4Gk+U8EqqStL+JFa9bp1Q==',
     'CephManilaClientKey': b'AQANOFFY1NW6AxAAu6jWI3YSOsp2QWusb5Y3DQ==',
     'CephMonKey': b'AQCQXtlXAAAAABAA9l+59N3yH+C49Y0JiKeGFg==',
+    'CephGrafanaAdminPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
+    'CephDashboardAdminPassword': 'NYJN86Fua3X8AVFWmMhQa2zTH',
     'SwiftHashSuffix': 'td8mV6k7TYEGKCDvjVBwckpn9',
     'SnmpdReadonlyUserPassword': 'TestPassword',
     'SwiftPassword': 'z6EWAVfW7CuxvKdzjWTdrXCeg',

tripleo_common/tests/image/test_kolla_builder.py

@@ -238,6 +238,18 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'ceph_namespace': 'docker.io/ceph',
                 'ceph_image': 'daemon',
                 'ceph_tag': 'v4.0.0-stable-4.0-nautilus-centos-7-x86_64',
+                'ceph_grafana_namespace': 'docker.io/grafana',
+                'ceph_grafana_image': 'grafana',
+                'ceph_grafana_tag': 'latest',
+                'ceph_prometheus_namespace': 'docker.io/prom',
+                'ceph_prometheus_image': 'prometheus',
+                'ceph_prometheus_tag': 'latest',
+                'ceph_alertmanager_namespace': 'docker.io/prom',
+                'ceph_alertmanager_image': 'alertmanager',
+                'ceph_alertmanager_tag': 'latest',
+                'ceph_node_exporter_namespace': 'docker.io/prom',
+                'ceph_node_exporter_image': 'node-exporter',
+                'ceph_node_exporter_tag': 'latest',
                 'name_prefix': 'centos-binary-',
                 'name_suffix': '',
                 'tag': 'current-tripleo',
@@ -298,6 +310,18 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'ceph_namespace': 'docker.io/cephh',
                 'ceph_image': 'ceph-daemon',
                 'ceph_tag': 'latest',
+                'ceph_grafana_namespace': 'docker.io/grafana',
+                'ceph_grafana_image': 'grafana',
+                'ceph_grafana_tag': 'latest',
+                'ceph_prometheus_namespace': 'docker.io/prom',
+                'ceph_prometheus_image': 'prometheus',
+                'ceph_prometheus_tag': 'latest',
+                'ceph_alertmanager_namespace': 'docker.io/prom',
+                'ceph_alertmanager_image': 'alertmanager',
+                'ceph_alertmanager_tag': 'latest',
+                'ceph_node_exporter_namespace': 'docker.io/prom',
+                'ceph_node_exporter_image': 'node-exporter',
+                'ceph_node_exporter_tag': 'latest',
                 'name_prefix': 'prefix-',
                 'name_suffix': '-suffix',
                 'tag': 'master',