dashboard: move defaults variables to ceph-defaults

There is no need to have default values for these variables in each roles
since there is no corresponding host groups

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 9f0d4d6847c6edff6804969ab4fdd34451a5d2cc)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 39621d62cb7457cea4b9d2b287e4821202d5cd84..72e672f511991dcb9eef55f849b631eb93d099dd 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -696,6 +696,49 @@ dummy:
 # For https, you should set dashboard.crt/key and grafana.crt/key
 #dashboard_protocol: http
 #dashboard_port: 8234
+#dashboard_admin_user: admin
+#dashboard_admin_password: admin
+# We only need this for SSL (https) connections
+#dashboard_crt: ''
+#dashboard_key: ''
+#dashboard_rgw_api_user_id: ceph-dashboard
+#dashboard_rgw_api_host: ''
+#dashboard_rgw_api_port: ''
+#dashboard_rgw_api_scheme: ''
+#dashboard_rgw_api_admin_resource: ''
+#dashboard_rgw_api_no_ssl_verify: False
+#node_exporter_container_image: prom/node-exporter:latest
+#grafana_admin_user: admin
+#grafana_admin_password: admin
+# We only need this for SSL (https) connections
+#grafana_crt: ''
+#grafana_key: ''
+#grafana_container_image: "grafana/grafana:latest"
+#grafana_container_cpu_period: 100000
+#grafana_container_cpu_cores: 2
+# container_memory is in GB
+#grafana_container_memory: 4
+#grafana_uid: 472
+#grafana_datasource: Dashboard
+#grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
+#grafana_plugins:
+#  - vonage-status-panel
+#  - grafana-piechart-panel
+#prometheus_container_image: prom/prometheus:latest
+#prometheus_container_cpu_period: 100000
+#prometheus_container_cpu_cores: 2
+# container_memory is in GB
+#prometheus_container_memory: 4
+#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
+#alertmanager_container_image: prom/alertmanager:latest
+#alertmanager_container_cpu_period: 100000
+#alertmanager_container_cpu_cores: 2
+# container_memory is in GB
+#alertmanager_container_memory: 4
+#alertmanager_data_dir: /var/lib/alertmanager
+#alertmanager_conf_dir: /etc/alertmanager
 
 
 ###############

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index eeb9b9a0a4763197a470ac9487705dbcbdcbc054..9511571bd111289cfab0ea8cb0bdbe99dfc2655a 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -696,6 +696,49 @@ ceph_docker_registry: "registry.access.redhat.com"
 # For https, you should set dashboard.crt/key and grafana.crt/key
 #dashboard_protocol: http
 #dashboard_port: 8234
+#dashboard_admin_user: admin
+#dashboard_admin_password: admin
+# We only need this for SSL (https) connections
+#dashboard_crt: ''
+#dashboard_key: ''
+#dashboard_rgw_api_user_id: ceph-dashboard
+#dashboard_rgw_api_host: ''
+#dashboard_rgw_api_port: ''
+#dashboard_rgw_api_scheme: ''
+#dashboard_rgw_api_admin_resource: ''
+#dashboard_rgw_api_no_ssl_verify: False
+#node_exporter_container_image: prom/node-exporter:latest
+#grafana_admin_user: admin
+#grafana_admin_password: admin
+# We only need this for SSL (https) connections
+#grafana_crt: ''
+#grafana_key: ''
+#grafana_container_image: "grafana/grafana:latest"
+#grafana_container_cpu_period: 100000
+#grafana_container_cpu_cores: 2
+# container_memory is in GB
+#grafana_container_memory: 4
+#grafana_uid: 472
+#grafana_datasource: Dashboard
+#grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
+#grafana_plugins:
+#  - vonage-status-panel
+#  - grafana-piechart-panel
+#prometheus_container_image: prom/prometheus:latest
+#prometheus_container_cpu_period: 100000
+#prometheus_container_cpu_cores: 2
+# container_memory is in GB
+#prometheus_container_memory: 4
+#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
+#alertmanager_container_image: prom/alertmanager:latest
+#alertmanager_container_cpu_period: 100000
+#alertmanager_container_cpu_cores: 2
+# container_memory is in GB
+#alertmanager_container_memory: 4
+#alertmanager_data_dir: /var/lib/alertmanager
+#alertmanager_conf_dir: /etc/alertmanager
 
 
 ###############

diff --git a/roles/ceph-dashboard/defaults/main.yml b/roles/ceph-dashboard/defaults/main.yml
deleted file mode 100644 (file)
index 048dc75..0000000
--- a/roles/ceph-dashboard/defaults/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-dashboard_admin_user: admin
-dashboard_admin_password: admin
-# We only need this for SSL (https) connections
-dashboard_crt: ''
-dashboard_key: ''
-dashboard_rgw_api_user_id: ceph-dashboard
-dashboard_rgw_api_host: ''
-dashboard_rgw_api_port: ''
-dashboard_rgw_api_scheme: ''
-dashboard_rgw_api_admin_resource: ''
-dashboard_rgw_api_no_ssl_verify: False

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 65c21d94ea89330a4a81dbdc376cf1771687dff7..967f4538511bde0e97331db4c6dd34503be54863 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -688,6 +688,49 @@ dashboard_enabled: False
 # For https, you should set dashboard.crt/key and grafana.crt/key
 dashboard_protocol: http
 dashboard_port: 8234
+dashboard_admin_user: admin
+dashboard_admin_password: admin
+# We only need this for SSL (https) connections
+dashboard_crt: ''
+dashboard_key: ''
+dashboard_rgw_api_user_id: ceph-dashboard
+dashboard_rgw_api_host: ''
+dashboard_rgw_api_port: ''
+dashboard_rgw_api_scheme: ''
+dashboard_rgw_api_admin_resource: ''
+dashboard_rgw_api_no_ssl_verify: False
+node_exporter_container_image: prom/node-exporter:latest
+grafana_admin_user: admin
+grafana_admin_password: admin
+# We only need this for SSL (https) connections
+grafana_crt: ''
+grafana_key: ''
+grafana_container_image: "grafana/grafana:latest"
+grafana_container_cpu_period: 100000
+grafana_container_cpu_cores: 2
+# container_memory is in GB
+grafana_container_memory: 4
+grafana_uid: 472
+grafana_datasource: Dashboard
+grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
+grafana_plugins:
+  - vonage-status-panel
+  - grafana-piechart-panel
+prometheus_container_image: prom/prometheus:latest
+prometheus_container_cpu_period: 100000
+prometheus_container_cpu_cores: 2
+# container_memory is in GB
+prometheus_container_memory: 4
+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
+alertmanager_container_image: prom/alertmanager:latest
+alertmanager_container_cpu_period: 100000
+alertmanager_container_cpu_cores: 2
+# container_memory is in GB
+alertmanager_container_memory: 4
+alertmanager_data_dir: /var/lib/alertmanager
+alertmanager_conf_dir: /etc/alertmanager
 
 
 ###############

diff --git a/roles/ceph-grafana/defaults/main.yml b/roles/ceph-grafana/defaults/main.yml
deleted file mode 100644 (file)
index 687c31e..0000000
--- a/roles/ceph-grafana/defaults/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-grafana_admin_user: admin
-grafana_admin_password: admin
-# We only need this for SSL (https) connections
-grafana_crt: ''
-grafana_key: ''
-grafana_container_image: "grafana/grafana:latest"
-grafana_container_cpu_period: 100000
-grafana_container_cpu_cores: 2
-# container_memory is in GB
-grafana_container_memory: 4
-grafana_uid: 472
-grafana_datasource: Dashboard
-grafana_dashboards_path: "/etc/grafana/dashboards/ceph-dashboard"
-grafana_plugins:
-  - vonage-status-panel
-  - grafana-piechart-panel

diff --git a/roles/ceph-node-exporter/defaults/main.yml b/roles/ceph-node-exporter/defaults/main.yml
deleted file mode 100644 (file)
index 1f150b9..0000000
--- a/roles/ceph-node-exporter/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-node_exporter_container_image: prom/node-exporter:latest

diff --git a/roles/ceph-prometheus/defaults/main.yml b/roles/ceph-prometheus/defaults/main.yml
deleted file mode 100644 (file)
index e1fc51c..0000000
--- a/roles/ceph-prometheus/defaults/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-prometheus_container_image: prom/prometheus:latest
-prometheus_container_cpu_period: 100000
-prometheus_container_cpu_cores: 2
-# container_memory is in GB
-prometheus_container_memory: 4
-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
-
-alertmanager_container_image: prom/alertmanager:latest
-alertmanager_container_cpu_period: 100000
-alertmanager_container_cpu_cores: 2
-# container_memory is in GB
-alertmanager_container_memory: 4
-alertmanager_data_dir: /var/lib/alertmanager
-alertmanager_conf_dir: /etc/alertmanager