mirror of https://github.com/ceph/ceph-ansible.git
Parse ceph_docker_registry in switch to containers
Defaults it to docker.io as it was for backward compatibility.pull/1779/head
parent
a59b84d5c9
commit
f0423b1804
|
@ -145,7 +145,7 @@
|
|||
|
||||
- name: start ceph mon container image
|
||||
docker:
|
||||
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
image: "{{ ceph_docker_registry|default('docker.io') }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
name: "ceph-mon-{{ ansible_hostname }}"
|
||||
net: "host"
|
||||
state: "running"
|
||||
|
@ -242,7 +242,7 @@
|
|||
|
||||
- name: start ceph osd container image(s)
|
||||
docker:
|
||||
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
image: "{{ ceph_docker_registry|default('docker.io') }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
name: "ceph-osd-{{ ansible_hostname }}-dev{{ item | regex_replace('/', '') }}"
|
||||
net: host
|
||||
pid: host
|
||||
|
@ -306,7 +306,7 @@
|
|||
|
||||
- name: start ceph metadata container image
|
||||
docker:
|
||||
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
image: "{{ ceph_docker_registry|default('docker.io') }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
name: ceph-mds-{{ ansible_hostname }}
|
||||
net: host
|
||||
state: running
|
||||
|
@ -357,7 +357,7 @@
|
|||
|
||||
- name: start ceph rados gateway container image
|
||||
docker:
|
||||
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
image: "{{ ceph_docker_registry|default('docker.io') }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
name: ceph-rgw-{{ ansible_hostname }}
|
||||
expose: "{{ ceph_rgw_civetweb_port }}"
|
||||
ports: "{{ ceph_rgw_civetweb_port }}:{{ ceph_rgw_civetweb_port }}"
|
||||
|
@ -409,7 +409,7 @@
|
|||
|
||||
- name: start ceph rbd mirror container image
|
||||
docker:
|
||||
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
image: "{{ ceph_docker_registry|default('docker.io') }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
name: "ceph-rbd-mirror-{{ ansible_hostname }}"
|
||||
net: host
|
||||
state: running
|
||||
|
@ -459,7 +459,7 @@
|
|||
|
||||
- name: start ceph nfs container image
|
||||
docker:
|
||||
image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
image: "{{ ceph_docker_registry|default('docker.io') }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
|
||||
name: "ceph-nfs-{{ ansible_hostname }}"
|
||||
net: "host"
|
||||
state: "running"
|
||||
|
|
Loading…
Reference in New Issue