r10k - Puppetfile concerns with Pull request

asked 2015-10-07 10:46:39 -0600

Hi all,

I have a concern with r10k.

My concern is that the Puppetfile needs to be pushed to my remote repository so I can check the changes I commited. To do that, I need to commit changes (included to the Puppetfile) then I need to push it to the remote repository.

Once I want to merge these changes from a specific branch to the master branch, I do NOT want to include this file. In other words, I want to merge all files except the Puppetfile file.

For instance, on my staging environment, the Puppetfile will be configured to deploy all staging branch from every module. If I merge this file to my production branch, that means that my production environment will have also all staging branch deployed which is not what I want (indeed I want all production branch to be deployed).

What do you suggest?

Reminder: I can't ignore the file as I have to push it to the remote repository (origin)

Regards, Rudy YAYON

edit retag flag offensive close merge delete