From: Christian Berendt Date: Tue, 12 Dec 2017 10:06:15 +0000 (+0100) Subject: Rename fact docker_version to ceph_docker_version X-Git-Tag: v3.0.16~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f34a4e2d430995e0c7af431736349dc5c73c106d;p=ceph-ansible.git Rename fact docker_version to ceph_docker_version The name docker_version is very generic and is also used by other roles. As a result, there may be name conflicts. To avoid this a ceph_ prefix should be used for this fact. Since it is an internal fact renaming is not a problem. (cherry picked from commit 50a848dc408a35c02b934bfe1511cd8aaee259be) Signed-off-by: Sébastien Han --- diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml index 9def0be55..886a5d1e9 100644 --- a/roles/ceph-docker-common/tasks/main.yml +++ b/roles/ceph-docker-common/tasks/main.yml @@ -36,12 +36,12 @@ - name: get docker version command: docker --version changed_when: false - always_run: yes - register: docker_version + check_mode: no + register: ceph_docker_version -- name: set_fact docker_version docker_version.stdout.split +- name: set_fact ceph_docker_version ceph_docker_version.stdout.split set_fact: - docker_version: "{{ docker_version.stdout.split(' ')[2] }}" + ceph_docker_version: "{{ ceph_docker_version.stdout.split(' ')[2] }}" # Only include 'checks.yml' when : # we are deploying containers without kv AND host is either a mon OR a nfs OR an osd, diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2 index 68f1f6977..a7adea5b4 100644 --- a/roles/ceph-mds/templates/ceph-mds.service.j2 +++ b/roles/ceph-mds/templates/ceph-mds.service.j2 @@ -8,8 +8,8 @@ ExecStartPre=-/usr/bin/docker stop ceph-mds-{{ ansible_hostname }} ExecStartPre=-/usr/bin/docker rm ceph-mds-{{ ansible_hostname }} ExecStart=/usr/bin/docker run --rm --net=host \ --memory={{ ceph_mds_docker_memory_limit }} \ - {% if docker_version.split('.')[0] | version_compare('13', '>=') -%} - --cpus={{ ceph_mds_docker_cpu_limit }} \ + {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%} + --cpus={{ ceph_mds_docker_cpu_limit }} \ {% else -%} --cpu-quota={{ ceph_mds_docker_cpu_limit * 100000 }} \ {% endif -%} diff --git a/roles/ceph-mgr/templates/ceph-mgr.service.j2 b/roles/ceph-mgr/templates/ceph-mgr.service.j2 index 981289199..7dcd9cc87 100644 --- a/roles/ceph-mgr/templates/ceph-mgr.service.j2 +++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2 @@ -8,8 +8,8 @@ ExecStartPre=-/usr/bin/docker stop ceph-mgr-{{ ansible_hostname }} ExecStartPre=-/usr/bin/docker rm ceph-mgr-{{ ansible_hostname }} ExecStart=/usr/bin/docker run --rm --net=host \ --memory={{ ceph_mgr_docker_memory_limit }} \ - {% if docker_version.split('.')[0] | version_compare('13', '>=') -%} - --cpus={{ ceph_mgr_docker_cpu_limit }} \ + {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%} + --cpus={{ ceph_mgr_docker_cpu_limit }} \ {% else -%} --cpu-quota={{ ceph_mgr_docker_cpu_limit * 100000 }} \ {% endif -%} diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index 3583640e2..28bb33699 100644 --- a/roles/ceph-mon/templates/ceph-mon.service.j2 +++ b/roles/ceph-mon/templates/ceph-mon.service.j2 @@ -8,7 +8,7 @@ ExecStartPre=-/usr/bin/docker rm ceph-mon-%i ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \ --memory={{ ceph_mon_docker_memory_limit }} \ -{% if docker_version.split('.')[0] | version_compare('13', '>=') -%} +{% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%} --cpus={{ ceph_mon_docker_cpu_limit }} \ {% else -%} --cpu-quota={{ ceph_mon_docker_cpu_limit * 100000 }} \ diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2 index 79c9b025d..6651eb6b0 100644 --- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 +++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2 @@ -49,8 +49,8 @@ expose_partitions "$1" --privileged=true \ --pid=host \ --memory={{ ceph_osd_docker_memory_limit }} \ - {% if docker_version.split('.')[0] | version_compare('13', '>=') -%} - --cpus={{ ceph_osd_docker_cpu_limit }} \ + {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%} + --cpus={{ ceph_osd_docker_cpu_limit }} \ {% else -%} --cpu-quota={{ ceph_osd_docker_cpu_limit * 100000 }} \ {% endif -%} diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 index 9be66e5d6..902acab18 100644 --- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 +++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 @@ -8,8 +8,8 @@ ExecStartPre=-/usr/bin/docker stop ceph-rbd-mirror-{{ ansible_hostname }} ExecStartPre=-/usr/bin/docker rm ceph-rbd-mirror-{{ ansible_hostname }} ExecStart=/usr/bin/docker run --rm --net=host \ --memory={{ ceph_rbd_mirror_docker_memory_limit }} \ - {% if docker_version.split('.')[0] | version_compare('13', '>=') -%} - --cpus={{ ceph_rbd_mirror_docker_cpu_limit }} \ + {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%} + --cpus={{ ceph_rbd_mirror_docker_cpu_limit }} \ {% else -%} --cpu-quota={{ ceph_rbd_mirror_docker_cpu_limit * 100000 }} \ {% endif -%} diff --git a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 index dca881aa9..044f5f388 100644 --- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2 +++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2 @@ -8,8 +8,8 @@ ExecStartPre=-/usr/bin/docker stop ceph-rgw-{{ ansible_hostname }} ExecStartPre=-/usr/bin/docker rm ceph-rgw-{{ ansible_hostname }} ExecStart=/usr/bin/docker run --rm --net=host \ --memory={{ ceph_rgw_docker_memory_limit }} \ - {% if docker_version.split('.')[0] | version_compare('13', '>=') -%} - --cpus={{ ceph_rgw_docker_cpu_limit }} \ + {% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%} + --cpus={{ ceph_rgw_docker_cpu_limit }} \ {% else -%} --cpu-quota={{ ceph_rgw_docker_cpu_limit * 100000 }} \ {% endif -%}