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

rpm: ship rhcs.yaml.sample as all.yml.sample on RHEL #1900

Merged
merged 1 commit into from Sep 18, 2017
Merged

Conversation

ktdreyer
Copy link
Member

When building the RPM on RHEL, we will ship the conents of the rhcs.yml.sample file into all.yml.sample.

The purpose of this change is to expose "all.yml.sample" to both upstream and downstream users, so they use the same file name (but with different contents.)

When building the RPM on RHEL, we will ship the conents of the
`rhcs.yml.sample` file into `all.yml.sample`.

The purpose of this change is to expose "all.yml.sample" to both
upstream and downstream users, so they use the same file name (but with
different contents.)
@alfredodeza
Copy link
Contributor

This is just another thing that downstream needs to carry over, adding more confusion to any user that wants to just consume this as-is.

A simple diff on those files is just changing 3 variables. Why are we maintaining this in this way? Why is it necessary to carry almost 500 lines over to another file where only 3 lines are changing?

How can we make it simpler?

@leseb
Copy link
Member

leseb commented Sep 18, 2017

@alfredodeza we could make this easier but the release is approaching and we don't have much time to spend on this. We will address this in the next one.

rm group_vars/all.yml.sample
%if ! 0%{?fedora} && ! 0%{?centos}
# Ship only the Red Hat Ceph Storage config (overwrite upstream settings)
cp group_vars/rhcs.yml.sample group_vars/all.yml.sample
Copy link
Member

Choose a reason for hiding this comment

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

@ktdreyer don't we need -f?

@leseb leseb merged commit 1b46817 into master Sep 18, 2017
@leseb leseb deleted the rpm-all-yaml branch September 18, 2017 12:52
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

4 participants