]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
group_vars: fix default values
authorDimitri Savineau <dsavinea@redhat.com>
Thu, 15 Apr 2021 14:24:22 +0000 (10:24 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 21 May 2021 11:29:59 +0000 (13:29 +0200)
It looks like the generate_group_vars_sample.sh script wasn't executed
during previous PRs that were modifying the default values.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 83a8dd5a6a1f9ffe43b2a75d7b49775e34c58f24)

group_vars/all.yml.sample
group_vars/nfss.yml.sample
group_vars/rhcs.yml.sample

index 44eaddb962d332577c8fa616ba8aeb56c93274a7..eb5aaec028d7de3528d98ce84be0978805e98321 100644 (file)
@@ -661,8 +661,8 @@ dummy:
 #dashboard_rgw_api_admin_resource: ''
 #dashboard_rgw_api_no_ssl_verify: False
 #dashboard_frontend_vip: ''
-#alertmanager_frontend_vip: ''
 #prometheus_frontend_vip: ''
+#alertmanager_frontend_vip: ''
 #node_exporter_container_image: "docker.io/prom/node-exporter:v0.17.0"
 #node_exporter_port: 9100
 #grafana_admin_user: admin
@@ -809,3 +809,4 @@ dummy:
 #container_exec_cmd:
 #docker: false
 #ceph_volume_debug: "{{ enable_ceph_volume_debug | ternary(1, 0)  }}"
+
index 10d7a5f8dd69e2a30d5e41f23bcfa6d382f4323d..47ba271b611916a4dd25b444d18e1a7f1450abe4 100644 (file)
@@ -140,3 +140,4 @@ dummy:
 #ceph_docker_image_tag: latest
 #ceph_nfs_docker_extra_env:
 #ceph_config_keys: [] # DON'T TOUCH ME
+
index 76d652042df24f0e900108e39029ed914dc670fc..ca3c651cd98bba6313acc2ffceca13bd2175200e 100644 (file)
@@ -809,3 +809,4 @@ alertmanager_container_image: registry.redhat.io/openshift4/ose-prometheus-alert
 #container_exec_cmd:
 #docker: false
 #ceph_volume_debug: "{{ enable_ceph_volume_debug | ternary(1, 0)  }}"
+