ansible: Set RAM quotas on containers

We default to 4GB RAM, and we use double that value for swap.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/ansible/roles/ceph-grafana/defaults/main.yml b/ansible/roles/ceph-grafana/defaults/main.yml
index b6649c4e13c8d734ea4d0d7accd86a36068a39ce..cf0d3a00846dca7d857a19a15215cbaddd9a1f65 100644 (file)
--- a/ansible/roles/ceph-grafana/defaults/main.yml
+++ b/ansible/roles/ceph-grafana/defaults/main.yml
@@ -8,6 +8,8 @@ defaults:
     container_name: "grafana/grafana"
     container_cpu_period: 100000
     container_cpu_cores: 2
+    # container_memory is in GB
+    container_memory: 4
     # version currently only applies to containers
     version: 5.0.4
     datasource: Local

diff --git a/ansible/roles/ceph-grafana/tasks/setup_container.yml b/ansible/roles/ceph-grafana/tasks/setup_container.yml
index 57ab0718da666634dab570d79f0fa7d0683422ce..a6fed77f4c7408a54f2021f1c33069717b83216a 100644 (file)
--- a/ansible/roles/ceph-grafana/tasks/setup_container.yml
+++ b/ansible/roles/ceph-grafana/tasks/setup_container.yml
@@ -41,7 +41,11 @@
     keep_volumes: true
     pull: true
     cpu_period: "{{ grafana.container_cpu_period }}"
+    # As of ansible-2.5.2, this module doesn't support the equivalent of the
+    # --cpus flag, so we must use period/quota for now
     cpu_quota: "{{ grafana.container_cpu_period * grafana.container_cpu_cores }}"
+    memory: "{{ grafana.container_memory }}GB"
+    memory_swap: "{{ grafana.container_memory * 2 }}GB"
     env:
       GF_INSTALL_PLUGINS: "{{ grafana.plugins|join(',') }}"
 

diff --git a/ansible/roles/ceph-prometheus/defaults/main.yml b/ansible/roles/ceph-prometheus/defaults/main.yml
index 256d2998930ba5a95c6f095e17f406c0121ab2bf..72d1b510e606210a8558455e5c42e6f07216eb39 100644 (file)
--- a/ansible/roles/ceph-prometheus/defaults/main.yml
+++ b/ansible/roles/ceph-prometheus/defaults/main.yml
@@ -4,6 +4,8 @@ defaults:
     container_name: prom/prometheus
     container_cpu_period: 100000
     container_cpu_cores: 2
+    # container_memory is in GB
+    container_memory: 4
     version: latest
     data_dir: /var/lib/cephmetrics
     user_id: '65534'  # This is the UID used by the prom/prometheus docker image

diff --git a/ansible/roles/ceph-prometheus/tasks/setup_container.yml b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
index 17622ba58955451e45338acd350dc258d560b79d..e415abe3730f492b4f2da971ae0260af4060f24f 100644 (file)
--- a/ansible/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
@@ -25,4 +25,8 @@
     # As of ansible-2.5.2, this module doesn't support the equivalent of the
     # --cpus flag, so we must use period/quota for now
     cpu_quota: "{{ prometheus.container_cpu_period * prometheus.container_cpu_cores }}"
+    #memory: 0
+    #memory_swap: 0
+    memory: "{{ prometheus.container_memory }}GB"
+    memory_swap: "{{ prometheus.container_memory * 2 }}GB"
   notify: Service handler