]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit
ceph-osd: set container objectstore env variables
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 20 Jan 2020 16:24:08 +0000 (11:24 -0500)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Mon, 20 Jan 2020 18:59:44 +0000 (13:59 -0500)
commitc9e1fe3d928111275be5ab06ae01d82df8fa8bd4
tree25cd5018a5916daf88490fa9203742989ba07582
parent3842aa1a30277b5ea3acf78ac1aef37bad5afb14
ceph-osd: set container objectstore env variables

Because we need to manage legacy ceph-disk based OSD with ceph-volume
then we need a way to know the osd_objectstore in the container.
This was done like this previously with ceph-disk so we should also
do it with ceph-volume.
Note that this won't have any impact for ceph-volume lvm based OSD.

Rename docker_env_args fact to container_env_args and move the container
condition on the include_tasks call.
Remove OSD_DMCRYPT env variable from the ceph-osd template because it's
now included in the container_env_args variable.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1792122
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
roles/ceph-osd/tasks/container_options_facts.yml
roles/ceph-osd/tasks/main.yml
roles/ceph-osd/templates/ceph-osd-run.sh.j2