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

Synchronize Puppet DPM with UMD-3 #216

Merged
merged 6 commits into from Oct 2, 2018
Merged

Synchronize Puppet DPM with UMD-3 #216

merged 6 commits into from Oct 2, 2018

Conversation

Pansanel
Copy link
Contributor

@Pansanel Pansanel commented Aug 27, 2018

This PR contains several changes based on the UMD-3 branch for the configuration of DPM with Puppet.

@jouvin
Copy link
Contributor

jouvin commented Aug 27, 2018

@Pansanel please could you provide a short description of this PR goal. It also seems that you need to rebase your branch on the last umd-4 master... Checking the check results, panlint also has one complaint but for some reason it is not reported as an error...

@Pansanel
Copy link
Contributor Author

@jouvin : concerning the panlint issue, I do not know how to cut the command properly.

@sartiran
Copy link
Collaborator

Hi Jerome,
I'm comparing these files with those at GRIF and it seems to me that they are not yet completely up to date.
Maybe I should make a PR using GRIF umd-4 templates as reference?

@Pansanel
Copy link
Contributor Author

Can you send me the files? I will test it on our infra and include in the PR. It will be more simple.

@sartiran
Copy link
Collaborator

Hi,

the files are already committed on my fork

sartiran@7c1328d

I can proceed with the PR if you want.

@jouvin
Copy link
Contributor

jouvin commented Aug 27, 2018

@sartiran I suggest that you open a PR with your files and that we close this one in this case, this is probably the easiest...

@Pansanel
Copy link
Contributor Author

@sartiran : additional question: by default the 'puppet' package is installed. In the case of puppet v4 and v5, it should be puppet-agent, isn't it?

@sartiran
Copy link
Collaborator

puppet-agent provides puppet >= 4.0.0 so "yum install puppet" installs the puppet-agent package for versions 4 and 5

@Pansanel
Copy link
Contributor Author

You are right, it works fine :-) If the changes are fine for you, can we merge the PR?

@sartiran
Copy link
Collaborator

Let me just double-check that this corresponds with what is in sartiran@7c1328d

@sartiran
Copy link
Collaborator

OK. It seems all ok to me.

@Pansanel
Copy link
Contributor Author

Can you merge the pull request?

@sartiran
Copy link
Collaborator

I do not think the above question is for me. But in case: no, I do not have the rights to merge the PR

@jouvin
Copy link
Contributor

jouvin commented Aug 29, 2018

I can merge it but @Pansanel I'd like that you rebase it on the last umd-4 upstream branch first. Would be good if @sartiran you could approve the request (I guess you have the right to do so, else we should give it to you...).

@jouvin
Copy link
Contributor

jouvin commented Aug 29, 2018

@sartiran you may have the right to merge it but the problem is that nobody approved it and it is a requirement for merging it (if you are not an admin).

@sartiran
Copy link
Collaborator

The PR I've done yesterday is the same #217 upstreams the same files and should be up to date with the umd-4 branch. Maybe we can merge that one

@jouvin
Copy link
Contributor

jouvin commented Aug 29, 2018

@sartiran @Pansanel I let you decide which PR is the most complete. Just approve the one you choose and close the other one. Then we can merge the selected one.

@Pansanel
Copy link
Contributor Author

Alright. I will merge #217 and rebase on head :-)

@Pansanel
Copy link
Contributor Author

I have rebased my branch and verified the modifications.

@jrha jrha added this to the 18.9 milestone Sep 10, 2018
@jouvin
Copy link
Contributor

jouvin commented Sep 20, 2018

@sartiran @Pansanel What is the status with this PR? It would be good to have it in 18.9...

@Pansanel
Copy link
Contributor Author

All requested modifications have been done. We could merge this PR. @sartiran can you verify and merge?

@sartiran
Copy link
Collaborator

Looks good to me but I do not seem to have the right to approve the request (I've added a review... but I do not see effects)

@jrha jrha merged commit f52c681 into quattor:umd-4 Oct 2, 2018
@jrha
Copy link
Member

jrha commented Oct 2, 2018

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants