In docker start scripts replace \u00a0 with \u0020

This will solve the following issue when starting docker containers on ubuntu:

invalid argument "1\u00a0" for --cpus=1 : failed to parse 1  as a rational number

Closes-bug: #2056

diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2
index 68f1f6977d60e3cf61cc07ae63c1e06480278673..a6baad21cdc6851651519fec6d25a4a11e649162 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -9,7 +9,7 @@ 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 }} \
+  --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 981289199ccc657504b061b45f483b1dfb81e213..18eab5ffc1b0a6f4c8194e3df51d30af33ba1fac 100644 (file)
--- a/roles/ceph-mgr/templates/ceph-mgr.service.j2
+++ b/roles/ceph-mgr/templates/ceph-mgr.service.j2
@@ -9,7 +9,7 @@ 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 }} \
+  --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 4b31d3eb952d6d06f37a0f729b98bfeae8b811d7..f1e9d318c506f86b0996a7f70e7b2ea7a6389af5 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -9,7 +9,7 @@ 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', '>=') -%}
-  --cpus={{ ceph_mon_docker_cpu_limit }} \
+  --cpus={{ ceph_mon_docker_cpu_limit }} \
   {% else -%}
   --cpu-quota={{ ceph_mon_docker_cpu_limit * 100000 }} \
   {% endif -%}

diff --git a/roles/ceph-osd/templates/ceph-osd-run.sh.j2 b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
index bd854ae0a87221a340e7e76405506aca24926136..0ff07ede8628962e6ef44a342c1629a858701074 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd-run.sh.j2
+++ b/roles/ceph-osd/templates/ceph-osd-run.sh.j2
@@ -26,7 +26,7 @@ expose_partitions "$1"
   --pid=host \
   --memory={{ ceph_osd_docker_memory_limit }} \
   {% if docker_version.split('.')[0] | version_compare('13', '>=') -%}
-  --cpus={{ ceph_osd_docker_cpu_limit }} \
+  --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 9be66e5d6e36108ddeb6a214c69df3db3c215498..5b0b4dbcac27d6a395d46429cf6eedd681ce1351 100644 (file)
--- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
+++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
@@ -9,7 +9,7 @@ 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 }} \
+  --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 c784d382290cccb1e2b3c8cf1c95165edd858066..6eed1117dbd70186fe9506463a1f0f35a72bf251 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-radosgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-radosgw.service.j2
@@ -9,7 +9,7 @@ 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 }} \
+  --cpus={{ ceph_rgw_docker_cpu_limit }} \
   {% else -%}
   --cpu-quota={{ ceph_rgw_docker_cpu_limit * 100000 }} \
   {% endif -%}