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

Add support for the 'package' omnibus configuration hash. #375

Merged
merged 1 commit into from
Jan 18, 2021

Conversation

rayward
Copy link
Contributor

@rayward rayward commented Jan 12, 2021

Pull Request (PR) description

Allow the package hash of options - https://gitlab.com/gitlab-org/omnibus-gitlab/blob/0eed527687a2d78ef2efb8f86435acc02a3b6a97/files/gitlab-config-template/gitlab.rb.template#L2150 - to be configured so that options such as systemd_after and systemd_wanted_by can be defined.

This Pull Request (PR) fixes the following issues

N/A

@rayward
Copy link
Contributor Author

rayward commented Jan 12, 2021

The CentOS builds are failing as mentioned here - #372 (comment)

@@ -130,6 +131,7 @@
Optional[Hash] $high_availability = undef,
Optional[Hash] $logging = undef,
Optional[Hash] $letsencrypt = undef,
Optional[Hash] $package = undef,
Copy link
Member

Choose a reason for hiding this comment

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

can you enforce the datatype a bit? What about this:

Suggested change
Optional[Hash] $package = undef,
Hash[String[1],String[1]] $package = {},

if possible, the default for arrays and hashes should always be an empty hash/array

Copy link
Contributor Author

@rayward rayward Jan 18, 2021

Choose a reason for hiding this comment

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

I've kept it optional with undef as the default as this is truly an optional param (as are the other hashes). This will also ensure that it won't (at least the header/description for this section) be rendered into the template when it's not supplied.

I've adjusted the data type to Optional[Hash[String[1], Scalar]].

@bastelfreak bastelfreak merged commit 06b3740 into voxpupuli:master Jan 18, 2021
@rayward rayward deleted the package-systemd-config branch January 18, 2021 23:08
@rayward rayward restored the package-systemd-config branch January 19, 2021 05:37
@rayward rayward deleted the package-systemd-config branch January 20, 2021 03:55
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

Successfully merging this pull request may close these issues.

2 participants