Fix units and add ability to have a dedicated instance

Few fixes on systemd unit templates for node_exporter and
alertmanager container parameters.
Added the ability to use a dedicated instance to deploy the
dashboard components (prometheus and grafana).
This commit also introduces the grafana_group_name variable
to refer grafana group and keep consistency with the other
groups.
During the integration with TripleO some grafana/prometheus
template variables resulted undefined. This commit adds the
ability to check if the group exist and create, accordingly,
different job groups in prometheus template.

Signed-off-by: fmount <fpantano@redhat.com>
(cherry picked from commit 069076bbfdef30c64b33dfcdd063b1e31d65d617)

diff --git a/Vagrantfile b/Vagrantfile
index 7916593cfaefbb22da1afa14c980477a9dd53714..f7fd826f6fbda1af5506dc1e444ba92144465437 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,6 +13,7 @@ NOSDS           = settings['osd_vms']
 NMDSS           = settings['mds_vms']
 NRGWS           = settings['rgw_vms']
 NNFSS           = settings['nfs_vms']
+GRAFANA         = settings['grafana_server_vms']
 NRBD_MIRRORS    = settings['rbd_mirror_vms']
 CLIENTS         = settings['client_vms']
 NISCSI_GWS      = settings['iscsi_gw_vms']
@@ -54,8 +55,9 @@ ansible_provision = proc do |ansible|
     'nfss'             => (0..NNFSS - 1).map { |j| "#{LABEL_PREFIX}nfs#{j}" },
     'rbd_mirrors'      => (0..NRBD_MIRRORS - 1).map { |j| "#{LABEL_PREFIX}rbd_mirror#{j}" },
     'clients'          => (0..CLIENTS - 1).map { |j| "#{LABEL_PREFIX}client#{j}" },
-    'iscsigws'        => (0..NISCSI_GWS - 1).map { |j| "#{LABEL_PREFIX}iscsi_gw#{j}" },
-    'mgrs'             => (0..MGRS - 1).map { |j| "#{LABEL_PREFIX}mgr#{j}" }
+    'iscsigws'         => (0..NISCSI_GWS - 1).map { |j| "#{LABEL_PREFIX}iscsi_gw#{j}" },
+    'mgrs'             => (0..MGRS - 1).map { |j| "#{LABEL_PREFIX}mgr#{j}" },
+    'grafana-server'   => (0..GRAFANA - 1).map { |j| "#{LABEL_PREFIX}grafana#{j}" }
   }
 
   ansible.extra_vars = {
@@ -177,6 +179,41 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
+  (0..GRAFANA - 1).each do |i|
+    config.vm.define "#{LABEL_PREFIX}grafana#{i}" do |grf|
+      grf.vm.hostname = "#{LABEL_PREFIX}grafana#{i}"
+      if ASSIGN_STATIC_IP
+        grf.vm.network :private_network,
+          ip: "#{PUBLIC_SUBNET}.3#{i}"
+      end
+      # Virtualbox
+      grf.vm.provider :virtualbox do |vb|
+        vb.customize ['modifyvm', :id, '--memory', "#{MEMORY}"]
+      end
+
+      # VMware
+      grf.vm.provider :vmware_fusion do |v|
+        v.vmx['memsize'] = "#{MEMORY}"
+      end
+
+      # Libvirt
+      grf.vm.provider :libvirt do |lv|
+        lv.memory = MEMORY
+        lv.random_hostname = true
+      end
+
+      # Parallels
+      grf.vm.provider "parallels" do |prl|
+        prl.name = "ceph-grafana#{i}"
+        prl.memory = "#{MEMORY}"
+      end
+
+      grf.vm.provider :linode do |provider|
+        provider.label = grf.vm.hostname
+      end
+    end
+  end
+
   (0..MGRS - 1).each do |i|
     config.vm.define "#{LABEL_PREFIX}mgr#{i}" do |mgr|
       mgr.vm.hostname = "#{LABEL_PREFIX}mgr#{i}"

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index de3ee1d397d2e3ccaf3ff5d4aa2d08dab1fe4a3d..e5933378a384f41e8f301814615b2fef8828fac2 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -55,6 +55,7 @@ dummy:
 #iscsi_gw_group_name: iscsigws
 #mgr_group_name: mgrs
 #rgwloadbalancer_group_name: rgwloadbalancers
+#grafana_server_group_name: grafana-server
 
 # If configure_firewall is true, then ansible will try to configure the
 # appropriate firewalling rules so that Ceph daemons can communicate

diff --git a/group_vars/dashboards.yml.sample b/group_vars/dashboards.yml.sample
index 94c9a5f40df4be4354f7afb742333252713490ae..44c48f1f5f2b401396ab970747a0232138c10303 100644 (file)
--- a/group_vars/dashboards.yml.sample
+++ b/group_vars/dashboards.yml.sample
@@ -18,4 +18,4 @@ dummy:
 #dashboard_rgw_api_scheme: ''
 #dashboard_rgw_api_admin_resource: ''
 #dashboard_rgw_api_no_ssl_verify: False
-
+#grafana_server_group_name: grafana-server

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 0b7c020737e4fed77b08934147a0fd41619e695b..91c0740637039ca64366a604b5c3cbc65c16a529 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -55,6 +55,7 @@ fetch_directory: ~/ceph-ansible-keys
 #iscsi_gw_group_name: iscsigws
 #mgr_group_name: mgrs
 #rgwloadbalancer_group_name: rgwloadbalancers
+#grafana_server_group_name: grafana-server
 
 # If configure_firewall is true, then ansible will try to configure the
 # appropriate firewalling rules so that Ceph daemons can communicate

diff --git a/roles/ceph-dashboard/tasks/configure_dashboard.yml b/roles/ceph-dashboard/tasks/configure_dashboard.yml
index 43917654c53b6417a52cbd6495ee20060c0d6cb9..7230a07b03a700e26b48b3b8c1614e4c5e7597f6 100644 (file)
--- a/roles/ceph-dashboard/tasks/configure_dashboard.yml
+++ b/roles/ceph-dashboard/tasks/configure_dashboard.yml
@@ -90,13 +90,23 @@
   delegate_to: "{{ groups[mon_group_name][0] }}"
   until: ac_result.rc == 0
 
+- name: set grafana url to grafana instance
+  set_fact:
+    dashboard_url: "{{ groups[grafana_server_group_name][0] }}"
+  when: "{{  groups.grafana_server_group_name is defined and groups[grafana_server_group_name] | length > 0 }}"
+
+- name: set grafana url to mon
+  set_fact:
+    dashboard_url: "{{ groups[mon_group_name][0] }}"
+  when: "{{ groups.grafana_server_group_name is not defined or groups[grafana_server_group_name] | length == 0 }}"
+
 - name: set grafana url
-  command: "{{ container_exec_cmd }} ceph dashboard set-grafana-api-url {{ dashboard_protocol }}://{{ groups['grafana-server'][0] }}:3000/"
+  command: "{{ container_exec_cmd }} ceph dashboard set-grafana-api-url {{ dashboard_protocol }}://{{ dashboard_url }}:3000/"
   delegate_to: "{{ groups[mon_group_name][0] }}"
   changed_when: false
 
 - name: set alertmanager host
-  command: "{{ container_exec_cmd }} ceph dashboard set-alertmanager-api-host {{ dashboard_protocol }}://{{ groups['grafana-server'][0] }}:9093/"
+  command: "{{ container_exec_cmd }} ceph dashboard set-alertmanager-api-host {{ dashboard_protocol }}://{{ dashboard_url }}:9093/"
   delegate_to: "{{ groups[mon_group_name][0] }}"
   changed_when: false
 

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 50e686d9e3c009b799d03cf66d0ebb930c0bc107..03cec9aa0d989a344d9198f57d80d2de906e41d1 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -47,6 +47,7 @@ client_group_name: clients
 iscsi_gw_group_name: iscsigws
 mgr_group_name: mgrs
 rgwloadbalancer_group_name: rgwloadbalancers
+grafana_server_group_name: grafana-server
 
 # If configure_firewall is true, then ansible will try to configure the
 # appropriate firewalling rules so that Ceph daemons can communicate

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index 9df92ece8001c87528ba313ba90241e089033444..05fba0327b4b8e0e515ad03ed8575924e8195b76 100644 (file)
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -289,3 +289,8 @@
     set_fact:
       ntp_service_name: ntpd
     when: ansible_os_family in ['RedHat', 'Suse']
+
+- name: set grafana_server_addr fact
+  set_fact:
+    grafana_server_addr: "{{ (hostvars[groups[grafana_server_group_name][0] | default(groups[mgr_group_name][0])])['ansible_all_ipv4_addresses'] | ipaddr(public_network) | first }}"
+  when:  groups.get(grafana_server_group_name, []) | length > 0 or groups.get(mgr_group_name, []) | length > 0

diff --git a/roles/ceph-grafana/templates/datasources-ceph-dashboard.yml.j2 b/roles/ceph-grafana/templates/datasources-ceph-dashboard.yml.j2
index 5d5ab0125374f8e40a50ebefe03f6855b7ef98a9..94d29530d39934ec4fe06ac93295edea7f506509 100644 (file)
--- a/roles/ceph-grafana/templates/datasources-ceph-dashboard.yml.j2
+++ b/roles/ceph-grafana/templates/datasources-ceph-dashboard.yml.j2
@@ -17,7 +17,7 @@ datasources:
   # <int> org id. will default to orgId 1 if not specified
   orgId: 1
   # <string> url
-  url: 'http://{{ groups["grafana-server"][0] }}:9090'
+  url: 'http://{{ grafana_server_addr | default(_current_monitor_address) }}:9090'
   # <bool> enable/disable basic auth
   basicAuth: false
   # <bool> mark as default datasource. Max one per org

diff --git a/roles/ceph-node-exporter/templates/node_exporter.service.j2 b/roles/ceph-node-exporter/templates/node_exporter.service.j2
index b1a7fd574f9f568df828f0cbf59170824006ab72..1f5dd715059964905bd6a248c1baf9fb4479d66a 100644 (file)
--- a/roles/ceph-node-exporter/templates/node_exporter.service.j2
+++ b/roles/ceph-node-exporter/templates/node_exporter.service.j2
@@ -14,10 +14,10 @@ ExecStartPre=-/usr/bin/{{ container_binary }} rm -f node-exporter
 ExecStart=/usr/bin/{{ container_binary }} run --name=node-exporter \
   -v /proc:/host/proc:ro -v /sys:/host/sys:ro \
   --net=host \
+  {{ node_exporter_container_image }}
   --path.procfs=/host/proc \
   --path.sysfs=/host/sys \
   --no-collector.timex \
-    {{ node_exporter_container_image }}
 # Make sure the cfg80211 is loaded before running the container, the node
 # exporter needs this module loaded to test for presence of wi-fi devices
 ExecStartPre=/usr/sbin/modprobe cfg80211

diff --git a/roles/ceph-prometheus/templates/alertmanager.service.j2 b/roles/ceph-prometheus/templates/alertmanager.service.j2
index e268bef90a4e5333a2bbae8782a0108407a75a7e..dc60ec1676128825951a4b6f7806004283d3713b 100644 (file)
--- a/roles/ceph-prometheus/templates/alertmanager.service.j2
+++ b/roles/ceph-prometheus/templates/alertmanager.service.j2
@@ -9,6 +9,7 @@ After=network.target
 {% endif %}
 
 [Service]
+WorkingDirectory={{ alertmanager_data_dir }}
 EnvironmentFile=-/etc/environment
 ExecStartPre=-/usr/bin/{{ container_binary }} rm -f alertmanager
 ExecStart=/usr/bin/{{ container_binary }} run --name=alertmanager \

diff --git a/roles/ceph-prometheus/templates/prometheus.yml.j2 b/roles/ceph-prometheus/templates/prometheus.yml.j2
index 71dcbb6a1b21018930688703a592fd05d770fe11..5c375f022bbac2411f0ae5033df3dd6bd7e73fd5 100644 (file)
--- a/roles/ceph-prometheus/templates/prometheus.yml.j2
+++ b/roles/ceph-prometheus/templates/prometheus.yml.j2
@@ -19,18 +19,26 @@ scrape_configs:
 {% endfor %}
   - job_name: 'node'
     static_configs:
-{% for host in (groups['all'] | difference(groups['grafana-server'])) %}
+{% if grafana_server_group_name in groups %}
+{% for host in (groups['all'] | difference(groups[grafana_server_group_name])) %}
       - targets: ['{{ host }}:9100']
         labels:
           instance: "{{ hostvars[host]['ansible_nodename'] }}"
 {% endfor %}
   - job_name: 'grafana'
     static_configs:
-{% for host in groups['grafana-server'] %}
+{% for host in groups[grafana_server_group_name] %}
       - targets: ['{{ host }}:9100']
         labels:
           instance: "{{ hostvars[host]['ansible_nodename'] }}"
 {% endfor %}
+{% else %}
+{% for host in groups['all'] %}
+      - targets: ['{{ host }}:9100']
+        labels:
+          instance: "{{ hostvars[host]['ansible_nodename'] }}"
+{% endfor %}
+{% endif %}
 {% if 'iscsigws' in groups %}
   - job_name: 'iscsi-gws'
     static_configs:
@@ -44,4 +52,4 @@ alerting:
   alertmanagers:
   - scheme: http
     static_configs:
-    - targets: ['{{ groups["grafana-server"][0] }}:9093']
+    - targets: ['{{ grafana_server_addr | default(_current_monitor_address) }}:9093']

diff --git a/site-container.yml.sample b/site-container.yml.sample
index 75add77fa687510f6de38dc9755a5feba2f64c19..70f3390952a583cce73357135742cd54b9198fb3 100644 (file)
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -518,7 +518,7 @@
       run_once: true
       when: not ceph_status.failed
 
-- hosts: grafana-server
+- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
   become: true
   tasks:
     - block:
@@ -545,7 +545,7 @@
           name: ceph-grafana
       when: dashboard_enabled | bool
 
-- hosts: '{{ (groups["mgrs"] | default(groups["mons"]))[0] }}'
+- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
   become: true
   tasks:
     - block:

diff --git a/site.yml.sample b/site.yml.sample
index c4ae70a325ef56d8e4014120e5f7e376a2a3f42d..9fde7693f0b9b070ec738258026e4b46f7d50655 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -537,8 +537,7 @@
             name: ceph-node-exporter
       when: dashboard_enabled | bool
 
-
-- hosts: grafana-server
+- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
   become: true
   tasks:
     - block:
@@ -561,7 +560,7 @@
             name: ceph-grafana
       when: dashboard_enabled | bool
 
-- hosts: '{{ (groups["mgrs"] | default(groups["mons"]))[0] }}'
+- hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
   become: true
   tasks:
     - import_role:

diff --git a/tests/functional/add-mdss/container/vagrant_variables.yml b/tests/functional/add-mdss/container/vagrant_variables.yml
index e3dd080ca0410f7480e3f9b9984849e35ee76ad1..c145a2fdc7a0c77ea29e30b5a6502e69d70b39c7 100644 (file)
--- a/tests/functional/add-mdss/container/vagrant_variables.yml
+++ b/tests/functional/add-mdss/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 1
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-mdss/vagrant_variables.yml b/tests/functional/add-mdss/vagrant_variables.yml
index db311d56d8e3dc454d45fd41a45a1f506c969bd4..9c40f37d390ab15c643dae1dd4d4044c7989044e 100644 (file)
--- a/tests/functional/add-mdss/vagrant_variables.yml
+++ b/tests/functional/add-mdss/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 1
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-mgrs/container/vagrant_variables.yml b/tests/functional/add-mgrs/container/vagrant_variables.yml
index 267925b2170f6daa021a5cc59b11917ecf0071a0..84c1b58fb263f4486668cd739721308b6b53026a 100644 (file)
--- a/tests/functional/add-mgrs/container/vagrant_variables.yml
+++ b/tests/functional/add-mgrs/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-mgrs/vagrant_variables.yml b/tests/functional/add-mgrs/vagrant_variables.yml
index 46a5d934dce92be43c9a1df9bce82f38c4236a05..da3719adaf9c262b66d3de61627f12245e0b0f36 100644 (file)
--- a/tests/functional/add-mgrs/vagrant_variables.yml
+++ b/tests/functional/add-mgrs/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-mons/container/vagrant_variables.yml b/tests/functional/add-mons/container/vagrant_variables.yml
index d0bdc6ed8b23c143d6b77039994cb941f9a16e31..099a4080ee01841aa02b214a7e91b52dc99b0fb0 100644 (file)
--- a/tests/functional/add-mons/container/vagrant_variables.yml
+++ b/tests/functional/add-mons/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-mons/vagrant_variables.yml b/tests/functional/add-mons/vagrant_variables.yml
index e3726e343a11a4373c725bf580127d2a5d729b96..ce43e35d1b1717d539135d603cb3f20207bd03e5 100644 (file)
--- a/tests/functional/add-mons/vagrant_variables.yml
+++ b/tests/functional/add-mons/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-osds/container/vagrant_variables.yml b/tests/functional/add-osds/container/vagrant_variables.yml
index c0bf4174f5bf1f59d19bc0d0a13355136e0b189a..b5440e3bf03cfa69593abec83874670aabe0bfb2 100644 (file)
--- a/tests/functional/add-osds/container/vagrant_variables.yml
+++ b/tests/functional/add-osds/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 2
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-osds/vagrant_variables.yml b/tests/functional/add-osds/vagrant_variables.yml
index 167b60cc2fe149fdda341ba61a985a97d1b9b195..1b29cf1a672be9cda98c8bc8e75670b38c43801b 100644 (file)
--- a/tests/functional/add-osds/vagrant_variables.yml
+++ b/tests/functional/add-osds/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 2
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-rbdmirrors/container/vagrant_variables.yml b/tests/functional/add-rbdmirrors/container/vagrant_variables.yml
index a305c0bfb6ac6310f2639520680f14d5fcf8acdc..eaec01dbb668f74c28391adb5a605a9bf3697ec5 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/vagrant_variables.yml
+++ b/tests/functional/add-rbdmirrors/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 1
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-rbdmirrors/vagrant_variables.yml b/tests/functional/add-rbdmirrors/vagrant_variables.yml
index 4575c83158516845b2fe7d885c6b2cb96168baa6..b10be1441fc94f6d2da96190896b2f64d961938d 100644 (file)
--- a/tests/functional/add-rbdmirrors/vagrant_variables.yml
+++ b/tests/functional/add-rbdmirrors/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 1
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-rgws/container/vagrant_variables.yml b/tests/functional/add-rgws/container/vagrant_variables.yml
index 8d2d33d7ba1530f26ef4eec8ccb031681e2eeb26..f26019607bbb4250933c44459d005a0bfb6022f4 100644 (file)
--- a/tests/functional/add-rgws/container/vagrant_variables.yml
+++ b/tests/functional/add-rgws/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 1
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/add-rgws/vagrant_variables.yml b/tests/functional/add-rgws/vagrant_variables.yml
index a34c281968b6110625c7bb4ae5a60f5a216fed12..b2d5ac2a65bc24b8df7dcb1f5dedca8f8827f23c 100644 (file)
--- a/tests/functional/add-rgws/vagrant_variables.yml
+++ b/tests/functional/add-rgws/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 1
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/all_daemons/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml
index b7df03dff15d5ae70e3203900c4336e8ad98c265..35d74e85466c4328b07ca5174985e1e9d1106de7 100644 (file)
--- a/tests/functional/all_daemons/container/vagrant_variables.yml
+++ b/tests/functional/all_daemons/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 2
 mds_vms: 1
 rgw_vms: 1
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 1
 client_vms: 2
 iscsi_gw_vms: 1

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index a2181a87030d50919f429673d6ba9ef30db1b2f2..841c0d2af3248afa34c3aff4d40b739f909a89e1 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 2
 mds_vms: 1
 rgw_vms: 1
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 1
 client_vms: 2
 iscsi_gw_vms: 1

diff --git a/tests/functional/collocation/container/vagrant_variables.yml b/tests/functional/collocation/container/vagrant_variables.yml
index 57678a119f88453248dec247b18179528323bbde..da495ef89a15fa3307f3f8f858e94e5df49f8dc6 100644 (file)
--- a/tests/functional/collocation/container/vagrant_variables.yml
+++ b/tests/functional/collocation/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 1
 rgw_vms: 1
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/collocation/vagrant_variables.yml b/tests/functional/collocation/vagrant_variables.yml
index a8268a5b629e97311f1b70cfdd54999e4c85b905..5b00444941ad58316e521275ce6e4be8ef205e83 100644 (file)
--- a/tests/functional/collocation/vagrant_variables.yml
+++ b/tests/functional/collocation/vagrant_variables.yml
@@ -5,6 +5,7 @@ osd_vms: 1
 mds_vms: 1
 rgw_vms: 1
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/dashboard/container/vagrant_variables.yml b/tests/functional/dashboard/container/vagrant_variables.yml
index 6e14fcf09c501b7f93cab6877f450d50d90d1c8e..7622a8dbdbf2f1f3c5da6f8e300a2abfbfbcf13c 100644 (file)
--- a/tests/functional/dashboard/container/vagrant_variables.yml
+++ b/tests/functional/dashboard/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 2
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/dashboard/vagrant_variables.yml b/tests/functional/dashboard/vagrant_variables.yml
index 788ee81cb7e20d030ca8ced696f30a59b6be43f8..51fe34e356c4ac5ed576df68d0442aec7d041401 100644 (file)
--- a/tests/functional/dashboard/vagrant_variables.yml
+++ b/tests/functional/dashboard/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 2
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 1
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/infra_lv_create/vagrant_variables.yml b/tests/functional/infra_lv_create/vagrant_variables.yml
index 59714099d706eadce4532f251ac4ea61b629d52c..a00b2357f17c2477eceba4b19fd3568642c57d5a 100644 (file)
--- a/tests/functional/infra_lv_create/vagrant_variables.yml
+++ b/tests/functional/infra_lv_create/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml b/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
index 77e357824e21c8699151d157ca47d5f5455d49aa..cea7fe89af075e5b075e4c4594fe000ddc95c481 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
+++ b/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/lvm-auto-discovery/vagrant_variables.yml b/tests/functional/lvm-auto-discovery/vagrant_variables.yml
index 6636233ccdc01b4c4a892911772369a92eaf3975..116034c25310f8add517373d1391a5bff879173c 100644 (file)
--- a/tests/functional/lvm-auto-discovery/vagrant_variables.yml
+++ b/tests/functional/lvm-auto-discovery/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/lvm-batch/container/vagrant_variables.yml b/tests/functional/lvm-batch/container/vagrant_variables.yml
index 6bf2bcd2020681af81fa12da7132572f47f01b45..8302bc6c9be38c59c26500451841d7e63b010f73 100644 (file)
--- a/tests/functional/lvm-batch/container/vagrant_variables.yml
+++ b/tests/functional/lvm-batch/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/lvm-batch/vagrant_variables.yml b/tests/functional/lvm-batch/vagrant_variables.yml
index 6636233ccdc01b4c4a892911772369a92eaf3975..116034c25310f8add517373d1391a5bff879173c 100644 (file)
--- a/tests/functional/lvm-batch/vagrant_variables.yml
+++ b/tests/functional/lvm-batch/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/lvm-osds/container/vagrant_variables.yml b/tests/functional/lvm-osds/container/vagrant_variables.yml
index acc1a4f44fb2803deef6d56ef5e62a0b4e2ba417..3664417830d34c7e19a610ee58485aa77c84bf13 100644 (file)
--- a/tests/functional/lvm-osds/container/vagrant_variables.yml
+++ b/tests/functional/lvm-osds/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 4
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/lvm-osds/vagrant_variables.yml b/tests/functional/lvm-osds/vagrant_variables.yml
index 748073a26262824f184c34062581533fd306f453..883a9a4d6c9fae50200f6436c9a3c567ff1f7765 100644 (file)
--- a/tests/functional/lvm-osds/vagrant_variables.yml
+++ b/tests/functional/lvm-osds/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 4
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/migrate_ceph_disk_to_ceph_volume/vagrant_variables.yml b/tests/functional/migrate_ceph_disk_to_ceph_volume/vagrant_variables.yml
index fa34052f2b23fb25c36e52edc409d659f0184961..d5f54f6f184b7fcb14092dd4edd44d6ce22facdf 100644 (file)
--- a/tests/functional/migrate_ceph_disk_to_ceph_volume/vagrant_variables.yml
+++ b/tests/functional/migrate_ceph_disk_to_ceph_volume/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/ooo-collocation/vagrant_variables.yml b/tests/functional/ooo-collocation/vagrant_variables.yml
index bb9f7b3be134109e08ed3e9ea2c995d62bcf18d5..5578a6c45c7564b5dad77f6d059d75be67a23dfb 100644 (file)
--- a/tests/functional/ooo-collocation/vagrant_variables.yml
+++ b/tests/functional/ooo-collocation/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 3
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 3
 iscsi_gw_vms: 0

diff --git a/tests/functional/podman/vagrant_variables.yml b/tests/functional/podman/vagrant_variables.yml
index 67d4109289b61acb5f90db4b8312eaefd2f0bece..90a2411a366c8afa83759513d754da21c00a9bea 100644 (file)
--- a/tests/functional/podman/vagrant_variables.yml
+++ b/tests/functional/podman/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 2
 mds_vms: 1
 rgw_vms: 1
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 1
 client_vms: 2
 iscsi_gw_vms: 1

diff --git a/tests/functional/rgw-multisite/container/vagrant_variables.yml b/tests/functional/rgw-multisite/container/vagrant_variables.yml
index 7ac4c64735a8909cfab9d047af4c8f13d5721354..4df53cceaf8832173cc2334fb51bec403c270a7f 100644 (file)
--- a/tests/functional/rgw-multisite/container/vagrant_variables.yml
+++ b/tests/functional/rgw-multisite/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/rgw-multisite/vagrant_variables.yml b/tests/functional/rgw-multisite/vagrant_variables.yml
index a867b3391549618f44430db427f31a6c09bee1d4..3c7a8d3e66561a384e971e13264fe0582edbb63c 100644 (file)
--- a/tests/functional/rgw-multisite/vagrant_variables.yml
+++ b/tests/functional/rgw-multisite/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/shrink_mon/container/vagrant_variables.yml b/tests/functional/shrink_mon/container/vagrant_variables.yml
index d52a3a97478d8aa1430a5bfdf2ebcce53155a7d1..1e7ba6028c6321c3ffcc4babec5cc7bf97f59a46 100644 (file)
--- a/tests/functional/shrink_mon/container/vagrant_variables.yml
+++ b/tests/functional/shrink_mon/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/shrink_mon/vagrant_variables.yml b/tests/functional/shrink_mon/vagrant_variables.yml
index 826f25c0b4f3b7fd6360acca644e8732a6ed4e8e..c4c86a5f86df8241694601df90b5556225810533 100644 (file)
--- a/tests/functional/shrink_mon/vagrant_variables.yml
+++ b/tests/functional/shrink_mon/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 1
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/shrink_osd/container/vagrant_variables.yml b/tests/functional/shrink_osd/container/vagrant_variables.yml
index bfce4cc5d478ef6d59a4bc4c6b6ac61e98ed9d55..f9575a7c7e2c8d50de878b8afec5a81ad262f61b 100644 (file)
--- a/tests/functional/shrink_osd/container/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/container/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 3
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/tests/functional/shrink_osd/vagrant_variables.yml b/tests/functional/shrink_osd/vagrant_variables.yml
index 3d2771563d40e09904202342327f8142b817e1e9..208a28f98ea8c9f479652dee5c7642de14dd781e 100644 (file)
--- a/tests/functional/shrink_osd/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/vagrant_variables.yml
@@ -9,6 +9,7 @@ osd_vms: 3
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0

diff --git a/vagrant_variables.yml.sample b/vagrant_variables.yml.sample
index ea156a0b7d342b6fec6382d89bd3bf7d1502a28c..7fb67acafc3e6bbb930a4f8ed687e77a948b3f7a 100644 (file)
--- a/vagrant_variables.yml.sample
+++ b/vagrant_variables.yml.sample
@@ -9,6 +9,7 @@ osd_vms: 3
 mds_vms: 0
 rgw_vms: 0
 nfs_vms: 0
+grafana_server_vms: 0
 rbd_mirror_vms: 0
 client_vms: 0
 iscsi_gw_vms: 0