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

Drop config_version and environment.conf #805

Merged
merged 1 commit into from
Oct 20, 2021

Conversation

optiz0r
Copy link
Contributor

@optiz0r optiz0r commented Sep 21, 2021

Support for dynamic and config environments was dropped in a61e010
however the config_version related parameters and the
environment.conf template used by these features were not removed
at the same time. This commit drops the unused code.

As parameters are being removed, this will be a breaking change and
require a major version bump.

@optiz0r optiz0r force-pushed the drop_config_version branch 2 times, most recently from 567b7ee to 21e671c Compare September 21, 2021 21:28
optiz0r added a commit to optiz0r/puppet-puppet that referenced this pull request Sep 21, 2021
This module adds support for the puppet environmentpath setting to be configured
using multiple directories. An example use-case is where r10k is in use to
deploy some but not all environments, to avoid unmanaged environments being
purged by r10k. Multiple directories are passed as an Array of Stdlib::Absolutepath
values. For backwards compatibility, a single string is also accepted, and converted
into a single-element array on each use.

- Each listed environmentpath directory will be created and managed by puppet
- The default post-receive hook script uses the first listed directory in
  `envs_dir` to create initial environments to maintain backward compatibility.

Tests are included to ensure that all listed directories are created and
managed, and that any other references to the envs_dir parameter behave the
same as if only a single directory were specified to maintain backward
compatibility.

Fixes theforeman#708
Depends on theforeman#805
optiz0r added a commit to optiz0r/puppet-puppet that referenced this pull request Sep 21, 2021
This module adds support for the puppet environmentpath setting to be configured
using multiple directories. An example use-case is where r10k is in use to
deploy some but not all environments, to avoid unmanaged environments being
purged by r10k. Multiple directories are passed as an Array of Stdlib::Absolutepath
values. For backwards compatibility, a single string is also accepted, and converted
into a single-element array on each use.

- Each listed environmentpath directory will be created and managed by puppet
- The default post-receive hook script uses the first listed directory in
  `envs_dir` to create initial environments to maintain backward compatibility.

Tests are included to ensure that all listed directories are created and
managed, and that any other references to the envs_dir parameter behave the
same as if only a single directory were specified to maintain backward
compatibility.

Fixes theforeman#708
Depends on theforeman#805
@ekohl
Copy link
Member

ekohl commented Sep 22, 2021

The unit test failures are odd. I submitted voxpupuli/puppet-systemd#229 which I think should fix them.

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Test suite is not complete yet, but I think the failures that do show up are unrelated.

@ekohl
Copy link
Member

ekohl commented Sep 22, 2021

Hmm, looks like the patch was wrong and I need to look at why it's failing.

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

You at least need to remove this:

spec/classes/puppet_server_spec.rb
91:        it { should_not contain_puppet__config__master('config_version') }

I think after that the test suite should pass.

optiz0r added a commit to optiz0r/puppet-puppet that referenced this pull request Oct 14, 2021
This module adds support for the puppet environmentpath setting to be configured
using multiple directories. An example use-case is where r10k is in use to
deploy some but not all environments, to avoid unmanaged environments being
purged by r10k. Multiple directories are passed as an Array of Stdlib::Absolutepath
values. For backwards compatibility, a single string is also accepted, and converted
into a single-element array on each use.

- Each listed environmentpath directory will be created and managed by puppet
- The default post-receive hook script uses the first listed directory in
  `envs_dir` to create initial environments to maintain backward compatibility.

Tests are included to ensure that all listed directories are created and
managed, and that any other references to the envs_dir parameter behave the
same as if only a single directory were specified to maintain backward
compatibility.

Fixes theforeman#708
Depends on theforeman#805
@optiz0r optiz0r requested a review from ekohl October 14, 2021 19:39
Support for dynamic and config environments was dropped in a61e010
however the `config_version` related parameters and the
`environment.conf` template used by these features were not removed
at the same time. This commit drops the unused code.

As parameters are being removed, this will be a breaking change and
require a major version bump.
optiz0r added a commit to optiz0r/puppet-puppet that referenced this pull request Oct 14, 2021
This module adds support for the puppet environmentpath setting to be configured
using multiple directories. An example use-case is where r10k is in use to
deploy some but not all environments, to avoid unmanaged environments being
purged by r10k. Multiple directories are passed as an Array of Stdlib::Absolutepath
values. For backwards compatibility, a single string is also accepted, and converted
into a single-element array on each use.

- Each listed environmentpath directory will be created and managed by puppet
- The default post-receive hook script uses the first listed directory in
  `envs_dir` to create initial environments to maintain backward compatibility.

Tests are included to ensure that all listed directories are created and
managed, and that any other references to the envs_dir parameter behave the
same as if only a single directory were specified to maintain backward
compatibility.

Fixes theforeman#708
Depends on theforeman#805
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

I kicked off the tests. If they're green(ish, we have some known failures), 👍

@ekohl ekohl merged commit e360bde into theforeman:master Oct 20, 2021
@ekohl
Copy link
Member

ekohl commented Oct 20, 2021

Thanks!

optiz0r added a commit to optiz0r/puppet-puppet that referenced this pull request Feb 4, 2022
This module adds support for the puppet environmentpath setting to be configured
using multiple directories. An example use-case is where r10k is in use to
deploy some but not all environments, to avoid unmanaged environments being
purged by r10k. Directories (whether one, or multiple) are passed as an
Array of Stdlib::Absolutepath values.

This is a breaking change, as a single string will no longer be accepted.

- Each listed environmentpath directory will be created and managed by puppet
- The default post-receive hook script uses the first listed directory in
  `envs_dir` to create initial environments to maintain backward compatibility.

Tests are included to ensure that all listed directories are created and
managed.

Fixes theforeman#708
Depends on theforeman#805
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants