Skip to content

Conversation

@igalic
Copy link
Contributor

@igalic igalic commented Dec 5, 2016

Fixes #63.
We rename the environment to venv_vars in order to ensure that hiera calls do not break, as soon as a puppet execution flow enters our module. For consistency's sake, we change environment not only in the main class (where it's definitely needed: rodjek/puppet-lint#574), but also in the certonly define.

@dhoppe
Copy link
Member

dhoppe commented Dec 29, 2016

@igalic Please resolve the merge conflicts.

@juniorsysadmin juniorsysadmin added needs-rebase needs-work not ready to merge just yet labels Jan 1, 2017
@igalic
Copy link
Contributor Author

igalic commented Jan 2, 2017

done

# [*path*]
# The path to the letsencrypt installation.
# [*environment*]
# [*venv_vars*]
Copy link
Member

Choose a reason for hiding this comment

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

Would you like to add documentation for venv_path at the same time?

@alexjfisher
Copy link
Member

This is a backwards incompatible change?
Is it worth bumping the version number in metadata.json now? (so as not to forget later)

@alexjfisher alexjfisher added the backwards-incompatible This change will lead to a major version bump for the next release label Jan 2, 2017
@juniorsysadmin
Copy link
Member

Label is the right thing

@juniorsysadmin juniorsysadmin removed the needs-work not ready to merge just yet label Jan 4, 2017
@igalic
Copy link
Contributor Author

igalic commented Feb 9, 2017

the basic question is: do we need a release before we merging this, yes/no?

@dhoppe
Copy link
Member

dhoppe commented Feb 9, 2017

According to SemVer, we should publish a new release, right?

@ekohl
Copy link
Member

ekohl commented Dec 4, 2018

This needs a rebase now due to conflicts.

This is a fix for #63.
We rename the `environment` to `venv_vars` in order to ensure that hiera
calls do *not* break, as soon as a puppet execution flow enters our
module. For consistency's sake, we change `environment` not only in the
main class (where it's definitely needed:
rodjek/puppet-lint#574), but also in the
`certonly` define.
@igalic
Copy link
Contributor Author

igalic commented Dec 5, 2018

This needs a rebase now due to conflicts.

gosh it's bee a while

but it's done

String $path = $letsencrypt::params::path,
$venv_path = $letsencrypt::params::venv_path,
Array $environment = [],
$venv_path = [],
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't look like a correct rebase

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops, thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

but now that i'm seeing this, we've already had $venv_vars — is this even still needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the answer is: potentially, but it needs to be rethought, rather than rebased.

Copy link
Member

Choose a reason for hiding this comment

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

No, we had venv_path so it's still useful to have I think

Copy link
Contributor Author

@igalic igalic left a comment

Choose a reason for hiding this comment

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

🤔

String $path = $letsencrypt::params::path,
$venv_path = $letsencrypt::params::venv_path,
Array $environment = [],
$venv_path = [],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

but now that i'm seeing this, we've already had $venv_vars — is this even still needed?

String $path = $letsencrypt::params::path,
$venv_path = $letsencrypt::params::venv_path,
Array $environment = [],
$venv_path = [],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the answer is: potentially, but it needs to be rethought, rather than rebased.

@vox-pupuli-tasks
Copy link

Dear @igalic, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

@igalic
Copy link
Contributor Author

igalic commented Nov 21, 2019

dear @pccibot,

as mentioned in my previous communique, this pull request is either obsolete, or it needs to be rethought.

Best regards,

i

@vox-pupuli-tasks
Copy link

Dear @igalic, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

@vox-pupuli-tasks
Copy link

Dear @igalic, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

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

Labels

backwards-incompatible This change will lead to a major version bump for the next release merge-conflicts needs-docs needs-rebase tests-fail

Projects

None yet

Development

Successfully merging this pull request may close these issues.

hiera breaks, as soon as we enter this module

5 participants