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

(SIMP-6238) Update to puppet-gitlab v3.0.2 #28

Merged
merged 4 commits into from
Mar 22, 2019

Conversation

lnemsick-simp
Copy link
Contributor

  • Switched from vshn/gitlab 1.13.3 to its replacement puppet/gitlab
    3.0.2 and reworked the manifests, as appropriate, to work with the
    newer module.
  • Added manage_package and package_ensure parameters to simp_gitlab

SIMP-6284 #close
SIMP-6285 #close
SIMP-6238 #close

- Switched from vshn/gitlab 1.13.3 to its replacement puppet/gitlab
  3.0.2 and reworked the manifests, as appropriate, to work with the
  newer module.
- Added manage_package and package_ensure parameters to simp_gitlab

SIMP-6284 #close
SIMP-6285 #close
SIMP-6238 #close
@lnemsick-simp
Copy link
Contributor Author


context 'simp_gitlab class without any parameters' do
let(:params) {{ }}
it_behaves_like 'a structured module'

Copy link
Member

Choose a reason for hiding this comment

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

Was there a reason to expand the it_behaves_like 'a structured module' into each individual line?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was only used in one place. So I thought the test was more clear with the example group expanded.

spec/classes/init_spec.rb Outdated Show resolved Hide resolved
manifests/install.pp Outdated Show resolved Hide resolved
# installed and that an initial reconfigure with the GITLAB_ROOT_PASSWORD
# environment variable set is executed.
#
# The reason the gitlab.rb/RPM ordering is important is as follows:
Copy link
Member

Choose a reason for hiding this comment

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

The details in this explanation would help a lot at voxpupuli/puppet-gitlab#301

op-ct and others added 2 commits March 21, 2019 18:12
Co-Authored-By: lnemsick-simp <lnemsick-simp@users.noreply.github.com>
manifests/init.pp Outdated Show resolved Hide resolved
@trevor-vaughan trevor-vaughan merged commit 969e548 into simp:master Mar 22, 2019
@lnemsick-simp lnemsick-simp deleted the SIMP-6238 branch April 5, 2019 19:55
use of the component module [`vshn/gitlab`][vshn_gitlab]. It is important to
note that `vshn-gitlab` configures the GitLab Omnibus's `/etc/gitlab/gitlab.rb`
use of the component module [`puppet/gitlab`][puppet_gitlab]. It is important to
note that `puppet-gitlab` configures the GitLab Omnibus's `/etc/gitlab/gitlab.rb`
and runs `gitlab-ctl reconfigure`.

Choose a reason for hiding this comment

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

puppet-gitlab no longer executes gitlab-ctl reconfigure explicitly unless you configure it to do so. Your package manager will do this whenever you install or upgrade the omnibus-gitlab package, as that's part of the omnibus's post-install script.

This same script in the omnibus also starts the gitlab supervisors for the relevant roles defined in the nodes gitlab.rb, and as such the puppet_gitlab module no longer manages the service explicitly by default.

I left some links to relevant info in the issue you opened in our repo. Let me know if you need any other information.

@LongLiveCHIEF
Copy link

This might be some interesting reading for you as well: voxpupuli/puppet-gitlab#240

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.

4 participants