From: Zack Cerza <zack@cerza.org>
Date: Mon, 14 May 2018 18:36:59 +0000 (-0600)
Subject: Merge pull request #173 from zmc/wip-cpu-quota
X-Git-Tag: v2.0~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=931373c7c28f397e454b3ae2b4379a6121fef378;p=cephmetrics.git

Merge pull request #173 from zmc/wip-cpu-quota

ansible: Set CPU/RAM quotas on containers
---

931373c7c28f397e454b3ae2b4379a6121fef378
diff --cc ansible/roles/ceph-prometheus/tasks/setup_container.yml
index 0991acc,e415abe..9058c78
--- a/ansible/roles/ceph-prometheus/tasks/setup_container.yml
+++ b/ansible/roles/ceph-prometheus/tasks/setup_container.yml
@@@ -21,13 -21,12 +21,21 @@@
      user: "{{ prometheus.user_id }}"
      keep_volumes: true
      pull: true
+     cpu_period: "{{ prometheus.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: "{{ 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
 +
 +- name: Ship systemd service
 +  copy:
 +    src: prometheus.service
 +    dest: "/etc/systemd/system/"
 +    owner: root
 +    group: root
 +    mode: 0644
 +  notify: Service handler