]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commit
docker: use a better method to pull images 1302/head
authorSébastien Han <seb@redhat.com>
Thu, 9 Feb 2017 14:16:39 +0000 (15:16 +0100)
committerSébastien Han <seb@redhat.com>
Thu, 9 Feb 2017 16:57:18 +0000 (17:57 +0100)
commitc2f1dca8236e758d0f28967d444bc7818eecbc84
treefc294c3cacceb88e438a189db56fbe99c3c71962
parent5ddfc4f85cc189076f6a756dd19ffdfca3b3841e
docker: use a better method to pull images

We changed the way we declare image.
Prior to this patch we must have a "user/image:tag"
format, which is incompatible with non docker-hub registry where you
usually don't have a "user". On the docker hub a "user" is also
identified as a namespace, so for Ceph the user was "ceph".

Variables have been simplified with only:

* ceph_docker_image
* ceph_docker_image_tag

1. For docker hub images: ceph_docker_name: "ceph/daemon" will give
you the 'daemon' image of the 'ceph' user.

2. For non docker hub images: ceph_docker_name: "daemon" will simply
give you the "daemon" image.

Infrastructure playbooks have been modified as well.
The file group_vars/all.docker.yml.sample has been removed as well.
It is hard to maintain since we have to generate it manually. If
you want to configure specific variables for a specific daemon simply
edit group_vars/$DAEMON.yml

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1420207
Signed-off-by: Sébastien Han <seb@redhat.com>
39 files changed:
group_vars/all.docker.yml.sample [deleted file]
group_vars/all.yml.sample
group_vars/mdss.yml.sample
group_vars/mons.yml.sample
group_vars/nfss.yml.sample
group_vars/osds.yml.sample
group_vars/rbd-mirrors.yml.sample
group_vars/restapis.yml.sample
group_vars/rgws.yml.sample
infrastructure-playbooks/purge-docker-cluster.yml
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
roles/ceph-common/defaults/main.yml
roles/ceph-common/tasks/docker/fetch_image.yml
roles/ceph-mds/defaults/main.yml
roles/ceph-mds/tasks/docker/main.yml
roles/ceph-mds/templates/ceph-mds.service.j2
roles/ceph-mon/defaults/main.yml
roles/ceph-mon/tasks/docker/main.yml
roles/ceph-mon/tasks/docker/pre_requisite.yml
roles/ceph-mon/tasks/docker/start_docker_monitor.yml
roles/ceph-mon/templates/ceph-mon.service.j2
roles/ceph-nfs/defaults/main.yml
roles/ceph-nfs/tasks/docker/create_configs.yml
roles/ceph-nfs/tasks/docker/main.yml
roles/ceph-nfs/templates/ceph-nfs.service.j2
roles/ceph-osd/defaults/main.yml
roles/ceph-osd/tasks/docker/main.yml
roles/ceph-osd/tasks/docker/pre_requisite.yml
roles/ceph-osd/tasks/docker/start_docker_osd.yml
roles/ceph-osd/templates/ceph-osd.service.j2
roles/ceph-rbd-mirror/defaults/main.yml
roles/ceph-rbd-mirror/tasks/docker/main.yml
roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
roles/ceph-restapi/defaults/main.yml
roles/ceph-restapi/tasks/docker/main.yml
roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
roles/ceph-rgw/defaults/main.yml
roles/ceph-rgw/tasks/docker/main.yml
roles/ceph-rgw/templates/ceph-rgw.service.j2