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.
pull/2278/head
Christian Berendt 2017-12-12 11:06:15 +01:00 committed by Sébastien Han
parent 162b7d2b23
commit 50a848dc40
7 changed files with 9 additions and 9 deletions

View File

@ -39,11 +39,11 @@
command: docker --version
changed_when: false
check_mode: no
register: docker_version
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,

View File

@ -8,7 +8,7 @@ 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', '>=') -%}
{% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
--cpus={{ ceph_mds_docker_cpu_limit }} \
{% else -%}
--cpu-quota={{ ceph_mds_docker_cpu_limit * 100000 }} \

View File

@ -8,7 +8,7 @@ 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', '>=') -%}
{% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
--cpus={{ ceph_mgr_docker_cpu_limit }} \
{% else -%}
--cpu-quota={{ ceph_mgr_docker_cpu_limit * 100000 }} \

View File

@ -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 }} \

View File

@ -49,7 +49,7 @@ expose_partitions "$1"
--privileged=true \
--pid=host \
--memory={{ ceph_osd_docker_memory_limit }} \
{% if docker_version.split('.')[0] | version_compare('13', '>=') -%}
{% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
--cpus={{ ceph_osd_docker_cpu_limit }} \
{% else -%}
--cpu-quota={{ ceph_osd_docker_cpu_limit * 100000 }} \

View File

@ -8,7 +8,7 @@ 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', '>=') -%}
{% 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 }} \

View File

@ -8,7 +8,7 @@ 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', '>=') -%}
{% if ceph_docker_version.split('.')[0] | version_compare('13', '>=') -%}
--cpus={{ ceph_rgw_docker_cpu_limit }} \
{% else -%}
--cpu-quota={{ ceph_rgw_docker_cpu_limit * 100000 }} \