Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: consolidate ceph-ansible and ceph-docker varible #1158

Merged
merged 3 commits into from Dec 13, 2016

Conversation

leseb
Copy link
Member

@leseb leseb commented Dec 6, 2016

This commit re-uses some of the existing ceph-ansible variables for a
containirzed deployment. There is no reasons why we should add new
variables for the containerized deployment.

Signed-off-by: Sébastien Han seb@redhat.com

@leseb leseb requested a review from font December 8, 2016 13:24
Copy link
Contributor

@font font left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but what are we going to do with all.docker.yml.sample? If we're going to keep it around it needs to also be brought up-to-date with these changes.

This commit re-uses some of the existing ceph-ansible variables for a
containirzed deployment. There is no reasons why we should add new
variables for the containerized deployment.

Signed-off-by: Sébastien Han <seb@redhat.com>
#ceph_mon_docker_username: ceph
#ceph_mon_docker_imagename: daemon
#ceph_mon_docker_image_tag: latest
#ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
#ceph_mon_extra_envs: "FSID={{ fsid }},MON_NAME={{ ansible_hostname }}" # comma separated variables
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't know fsid yet so this won't work, we skip ceph-common...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is true, but this variable is really only used for non-CoreOS and non-RedHat based systems. Even then, the FSID or CEPH_FSID environment variables, where ceph_mon_extra_envs is mostly used, aren't even consumed by the entrypoint.

Signed-off-by: Sébastien Han <seb@redhat.com>
For readibility and clarity we do not run any tasks directly in the
main.yml file. This file should only contain include, which helps us
later to apply conditionnals if we want to.

Signed-off-by: Sébastien Han <seb@redhat.com>
@andrewschoen andrewschoen merged commit b9d296e into master Dec 13, 2016
@leseb leseb deleted the ceph-ansible-docker-vars branch December 14, 2016 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants