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

Fixes #26199 - Fix dependency cycle when using git_repo #682

Merged
merged 1 commit into from
Mar 3, 2019

Conversation

ekohl
Copy link
Member

@ekohl ekohl commented Feb 28, 2019

Previously this resulted in a dependency cycle. The tests didn't compile so didn't catch it.

dependency cycles found: (File[/opt/puppetlabs/puppet/cache] => Class[Puppet::Server::Install] => Class[Puppet::Server::Config] => File[/opt/puppetlabs/puppet] => File[/opt/puppetlabs/puppet/cache])

a61e010 introduced this by managing $sharedir in puppet::server::config. $vardir was managed in puppet::server::install. Since sharedir is actually /opt/puppetlabs/puppet and vardir is the cache directory within that, it created a cycle.


file { $::puppet::vardir:
ensure => directory,
owner => 'root',
Copy link
Member Author

Choose a reason for hiding this comment

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

Note I am changing this. In the old code it was owned by puppet:puppet but now it's root:root. This matches with the puppet-agent package (at least 5.5.10).

@mmoll
Copy link
Contributor

mmoll commented Mar 2, 2019

tests fail 💔

Previously this resulted in a dependency cycle. The tests didn't compile
so didn't catch it.

    dependency cycles found: (File[/opt/puppetlabs/puppet/cache] => Class[Puppet::Server::Install] => Class[Puppet::Server::Config] => File[/opt/puppetlabs/puppet] => File[/opt/puppetlabs/puppet/cache])

a61e010 introduced this by managing
$sharedir in puppet::server::config. $vardir was managed in
puppet::server::install. Since sharedir is actually
/opt/puppetlabs/puppet and vardir is the cache directory within that, it
created a cycle.
@ekohl ekohl force-pushed the 26199-git-repo-cycle branch from 5ca9a3a to d7cb85b Compare March 2, 2019 20:34
@ekohl
Copy link
Member Author

ekohl commented Mar 3, 2019

💚

@mmoll mmoll merged commit 964f110 into theforeman:master Mar 3, 2019
@mmoll
Copy link
Contributor

mmoll commented Mar 3, 2019

merged, bedankt @ekohl!

@ekohl ekohl deleted the 26199-git-repo-cycle branch March 11, 2019 16:01
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