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

:default_branch and ':branch => :control_branch' are not supported #73

Closed
mchouque opened this issue Sep 13, 2017 · 3 comments
Closed

Comments

@mchouque
Copy link

Hello,

It's me again! :-)

Looking at the code it appears g10k doesn't support a default_branch keyword nor using a fallback to the control_branch as per:
https://docs.puppet.com/pe/latest/cmgmt_puppetfile.html#set-a-default-branch-for-content-deployment

Set a default branch for content deployment
You can set a default_branch option, which specifies what branch to deploy content from if the given ref, tag, commit, or branch option cannot be resolved and deployed. This is mostly useful when you set branch to the :control_branch value.

If the desired content cannot be resolved and no default branch is given, or if the default branch cannot be resolved, an error is logged and the content is not deployed or updated.

As such, they give the following example (which is pretty much how I use it):

mod 'hieradata',
  :git    => 'git@git.example.com:organization/hieradata.git',
  :branch => :control_branch,
  :default_branch => 'master'

Let me know if this is something you plan to support.

Cheers,
Mathieu

@xorpaul
Copy link
Owner

xorpaul commented Sep 13, 2017

You looked through the code, but not through the README? 😜

That feature is already in place, although under different names:

mod 'hieradata',
  :git    => 'git@git.example.com:organization/hieradata.git',
  :link => 'true',
  :fallback => 'master'

Because I implemented those features before r10k had them.

Maybe I'll try to support the r10k attribute names in the future.

@xorpaul
Copy link
Owner

xorpaul commented Sep 19, 2017

Added r10k settings :default_branch and :control_branch with v0.3.14 https://github.com/xorpaul/g10k/releases/tag/v0.3.14

@xorpaul xorpaul closed this as completed Sep 19, 2017
xorpaul added a commit that referenced this issue Sep 19, 2017
@xorpaul
Copy link
Owner

xorpaul commented Sep 19, 2017

Added hints to the README

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

No branches or pull requests

2 participants