From: Dimitri Savineau Date: Tue, 17 Mar 2020 00:45:03 +0000 (-0400) Subject: ceph-defaults: add registry name on dashboard vars X-Git-Tag: v6.0.0alpha1~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5051e67f8fa2046222fbd47b43bf7c1729e60f6c;p=ceph-ansible.git ceph-defaults: add registry name on dashboard vars We don't use the registry name when using the community dashboard container images (grafana, prometheus, alertmanager & node exporter). This commit adds the docker.io registry explicitly in the default dashboard container image name values. Signed-off-by: Dimitri Savineau --- diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 199d46d72..b0bb29d24 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -763,7 +763,7 @@ dummy: #dashboard_rgw_api_admin_resource: '' #dashboard_rgw_api_no_ssl_verify: False #dashboard_frontend_vip: '' -#node_exporter_container_image: "prom/node-exporter:v0.17.0" +#node_exporter_container_image: "docker.io/prom/node-exporter:v0.17.0" #node_exporter_port: 9100 #grafana_admin_user: admin # This variable must be set with a strong custom password when dashboard_enabled is True @@ -771,7 +771,7 @@ dummy: # We only need this for SSL (https) connections #grafana_crt: '' #grafana_key: '' -#grafana_container_image: "grafana/grafana:5.4.3" +#grafana_container_image: "docker.io/grafana/grafana:5.4.3" #grafana_container_cpu_period: 100000 #grafana_container_cpu_cores: 2 # container_memory is in GB @@ -797,7 +797,7 @@ dummy: # - grafana-piechart-panel #grafana_allow_embedding: True #grafana_port: 3000 -#prometheus_container_image: "prom/prometheus:v2.7.2" +#prometheus_container_image: "docker.io/prom/prometheus:v2.7.2" #prometheus_container_cpu_period: 100000 #prometheus_container_cpu_cores: 2 # container_memory is in GB @@ -806,7 +806,7 @@ dummy: #prometheus_conf_dir: /etc/prometheus #prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image #prometheus_port: 9092 -#alertmanager_container_image: "prom/alertmanager:v0.16.2" +#alertmanager_container_image: "docker.io/prom/alertmanager:v0.16.2" #alertmanager_container_cpu_period: 100000 #alertmanager_container_cpu_cores: 2 # container_memory is in GB diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index d7c9a5131..0d9cb3c5a 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -755,7 +755,7 @@ dashboard_rgw_api_user_id: ceph-dashboard dashboard_rgw_api_admin_resource: '' dashboard_rgw_api_no_ssl_verify: False dashboard_frontend_vip: '' -node_exporter_container_image: "prom/node-exporter:v0.17.0" +node_exporter_container_image: "docker.io/prom/node-exporter:v0.17.0" node_exporter_port: 9100 grafana_admin_user: admin # This variable must be set with a strong custom password when dashboard_enabled is True @@ -763,7 +763,7 @@ grafana_admin_user: admin # We only need this for SSL (https) connections grafana_crt: '' grafana_key: '' -grafana_container_image: "grafana/grafana:5.4.3" +grafana_container_image: "docker.io/grafana/grafana:5.4.3" grafana_container_cpu_period: 100000 grafana_container_cpu_cores: 2 # container_memory is in GB @@ -789,7 +789,7 @@ grafana_plugins: - grafana-piechart-panel grafana_allow_embedding: True grafana_port: 3000 -prometheus_container_image: "prom/prometheus:v2.7.2" +prometheus_container_image: "docker.io/prom/prometheus:v2.7.2" prometheus_container_cpu_period: 100000 prometheus_container_cpu_cores: 2 # container_memory is in GB @@ -798,7 +798,7 @@ prometheus_data_dir: /var/lib/prometheus prometheus_conf_dir: /etc/prometheus prometheus_user_id: '65534' # This is the UID used by the prom/prometheus container image prometheus_port: 9092 -alertmanager_container_image: "prom/alertmanager:v0.16.2" +alertmanager_container_image: "docker.io/prom/alertmanager:v0.16.2" alertmanager_container_cpu_period: 100000 alertmanager_container_cpu_cores: 2 # container_memory is in GB