From 3e0fa3bc180f10d72868de74b09bbf6355359485 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 5 Oct 2018 14:36:36 +0100 Subject: [PATCH] Add ability to use a different client container Currently a throw-away container is built to run ceph client commands to setup users, pools & auth keys. This utilises the same base ceph container which has all the ceph services inside it. This PR allows the use of a separate container if the deployer wishes - but defaults to use the same full ceph container. This can be used for different architectures or distributions, which may support the the Ceph client, but not Ceph server, and allows the deployer to build and specify a separate client container if need be. Signed-off-by: Andy McCrae --- group_vars/all.yml.sample | 4 ++++ group_vars/rhcs.yml.sample | 4 ++++ roles/ceph-client/tasks/create_users_keys.yml | 2 +- roles/ceph-defaults/defaults/main.yml | 4 ++++ roles/ceph-docker-common/tasks/main.yml | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index cb3cbc72d..d80ac21c2 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -516,6 +516,10 @@ dummy: #ceph_docker_image: "ceph/daemon" #ceph_docker_image_tag: latest #ceph_docker_registry: docker.io +## Client only docker image - defaults to {{ ceph_docker_image }} +#ceph_client_docker_image: "{{ ceph_docker_image }}" +#ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}" +#ceph_client_docker_registry: "{{ ceph_docker_registry }}" #ceph_docker_enable_centos_extra_repo: false #ceph_docker_on_openstack: false #containerized_deployment: False diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 64dda8845..68b69ed40 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -516,6 +516,10 @@ ceph_rhcs_version: 3 ceph_docker_image: "rhceph-3-rhel7" ceph_docker_image_tag: "latest" ceph_docker_registry: "registry.access.redhat.com/rhceph/" +## Client only docker image - defaults to {{ ceph_docker_image }} +#ceph_client_docker_image: "{{ ceph_docker_image }}" +#ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}" +#ceph_client_docker_registry: "{{ ceph_docker_registry }}" #ceph_docker_enable_centos_extra_repo: false #ceph_docker_on_openstack: false #containerized_deployment: False diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml index 95ac72577..72f11d0e7 100644 --- a/roles/ceph-client/tasks/create_users_keys.yml +++ b/roles/ceph-client/tasks/create_users_keys.yml @@ -33,7 +33,7 @@ -v {{ ceph_conf_key_directory }}:{{ ceph_conf_key_directory }}:z \ --name ceph-create-keys \ --entrypoint=sleep \ - {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} \ + {{ ceph_client_docker_registry}}/{{ ceph_client_docker_image }}:{{ ceph_client_docker_image_tag }} \ 300 changed_when: false when: diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 307328aa5..7277a0171 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -508,6 +508,10 @@ docker: false ceph_docker_image: "ceph/daemon" ceph_docker_image_tag: latest ceph_docker_registry: docker.io +## Client only docker image - defaults to {{ ceph_docker_image }} +ceph_client_docker_image: "{{ ceph_docker_image }}" +ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}" +ceph_client_docker_registry: "{{ ceph_docker_registry }}" ceph_docker_enable_centos_extra_repo: false ceph_docker_on_openstack: false containerized_deployment: False diff --git a/roles/ceph-docker-common/tasks/main.yml b/roles/ceph-docker-common/tasks/main.yml index d0110c8a7..e04450409 100644 --- a/roles/ceph-docker-common/tasks/main.yml +++ b/roles/ceph-docker-common/tasks/main.yml @@ -82,7 +82,7 @@ - fetch_container_image - name: get ceph version - command: docker run --rm --entrypoint /usr/bin/ceph {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }} --version + command: docker run --rm --entrypoint /usr/bin/ceph {{ ceph_client_docker_registry}}/{{ ceph_client_docker_image }}:{{ ceph_client_docker_image_tag }} --version changed_when: false check_mode: no register: ceph_version -- 2.39.5