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.

Sign up for GitHub

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

Support multiple envs_dir directories #803

Merged
merged 1 commit into from
Feb 5, 2022
Merged

Support multiple envs_dir directories #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@
#
# $server_environment_timeout:: Timeout for cached compiled catalogs (10s, 5m, ...)
#
# $server_envs_dir:: Directory that holds puppet environments
# $server_envs_dir:: List of directories which hold puppet environments
#
# $server_envs_target:: Indicates that $envs_dir should be
# a symbolic link to this target
Expand Down Expand Up @@ -656,7 +656,7 @@
String $server_environments_owner = $puppet::params::server_environments_owner,
Optional[String] $server_environments_group = $puppet::params::server_environments_group,
Pattern[/^[0-9]{3,4}$/] $server_environments_mode = $puppet::params::server_environments_mode,
Stdlib::Absolutepath $server_envs_dir = $puppet::params::server_envs_dir,
Array[Stdlib::Absolutepath, 1] $server_envs_dir = $puppet::params::server_envs_dir,
Optional[Stdlib::Absolutepath] $server_envs_target = $puppet::params::server_envs_target,
Variant[Undef, String[0], Array[Stdlib::Absolutepath]] $server_common_modules_path = $puppet::params::server_common_modules_path,
Pattern[/^[0-9]{3,4}$/] $server_git_repo_mode = $puppet::params::server_git_repo_mode,
Expand Down
4 changes: 2 additions & 2 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@
$server_environments_group = $root_group
$server_environments_mode = '0755'
# Where we store our puppet environments
$server_envs_dir = "${codedir}/environments"
$server_envs_dir = ["${codedir}/environments"]
$server_envs_target = undef
# Modules in this directory would be shared across all environments
$server_common_modules_path = unique(["${server_envs_dir}/common", "${codedir}/modules", "${sharedir}/modules", '/usr/share/puppet/modules'])
$server_common_modules_path = unique(["${server_envs_dir[0]}/common", "${codedir}/modules", "${sharedir}/modules", '/usr/share/puppet/modules'])

# Dynamic environments config, ignore if the git_repo is 'false'
# Path to the repository
Expand Down
7 changes: 5 additions & 2 deletions manifests/server.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@
#
# $environments_mode:: Environments directory mode.
#
# $envs_dir:: Directory that holds puppet environments
# $envs_dir:: List of directories that hold puppet environments
# All listed directories will be created and attributes managed,
# but only the first listed path will be used to populate
# environments from git repo branches.
#
# $envs_target:: Indicates that $envs_dir should be
# a symbolic link to this target
Expand Down Expand Up @@ -371,7 +374,7 @@
String $environments_owner = $puppet::server_environments_owner,
Optional[String] $environments_group = $puppet::server_environments_group,
Pattern[/^[0-9]{3,4}$/] $environments_mode = $puppet::server_environments_mode,
Stdlib::Absolutepath $envs_dir = $puppet::server_envs_dir,
Array[Stdlib::Absolutepath, 1] $envs_dir = $puppet::server_envs_dir,
Optional[Stdlib::Absolutepath] $envs_target = $puppet::server_envs_target,
Variant[Undef, String[0], Array[Stdlib::Absolutepath]] $common_modules_path = $puppet::server_common_modules_path,
Pattern[/^[0-9]{3,4}$/] $git_repo_mode = $puppet::server_git_repo_mode,
Expand Down
5 changes: 3 additions & 2 deletions manifests/server/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
$server_external_nodes = $puppet::server::external_nodes
$server_environment_timeout = $puppet::server::environment_timeout
$trusted_external_command = $puppet::server::trusted_external_command
$primary_envs_dir = $puppet::server::envs_dir[0]

if $server_external_nodes and $server_external_nodes != '' {
class{ 'puppet::server::enc':
Expand All @@ -56,7 +57,7 @@

puppet::config::main {
'reports': value => $puppet::server::reports;
'environmentpath': value => $puppet::server::envs_dir;
'environmentpath': value => $puppet::server::envs_dir.join(':');
}
if $puppet::server::hiera_config and !empty($puppet::server::hiera_config){
puppet::config::main {
Expand Down Expand Up @@ -258,7 +259,7 @@
mode => $puppet::server::git_repo_mode,
user => $puppet::server::git_repo_user,
group => $puppet::server::git_repo_group,
require => File[$puppet::vardir, $puppet::server::envs_dir],
require => File[$puppet::vardir, $primary_envs_dir],
}

$git_branch_map = $puppet::server::git_branch_map
Expand Down
17 changes: 17 additions & 0 deletions spec/classes/puppet_server_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,23 @@
it { should contain_puppet__config__master('trusted_external_command').with_value('/usr/local/sbin/trusted_external_command') }
end
end

describe 'with multiple environment paths' do
let(:params) do
super().merge(
server_envs_dir: ['/etc/puppetlabs/code/environments/', '/etc/puppetlabs/code/unmanaged-environments/'],
server_git_repo_path: '/test/puppet',
server_post_hook_name: 'post-receive',
server_git_repo: true,
)
end

it { should contain_puppet__config__main('environmentpath').with_value('/etc/puppetlabs/code/environments/:/etc/puppetlabs/code/unmanaged-environments/') }
it { should contain_file('/etc/puppetlabs/code/environments/') }
it { should contain_file('/etc/puppetlabs/code/unmanaged-environments/') }
it { should contain_git__repo('puppet_repo').that_requires('File[/etc/puppetlabs/code/environments/]') }
it { should contain_file('/test/puppet/hooks/post-receive').with_content(/ENVIRONMENT_BASEDIR\s=\s"\/etc\/puppetlabs\/code\/environments\/"/) }
end
end
end
end
2 changes: 1 addition & 1 deletion templates/server/post-receive.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $stdout.sync = true
$stderr.sync = true

# Set this to where you want to keep your environments
ENVIRONMENT_BASEDIR = "<%= scope.lookupvar("puppet::server::envs_dir") %>"
ENVIRONMENT_BASEDIR = "<%= scope.lookupvar("puppet::server::config::primary_envs_dir") %>"

# post-receive hooks set GIT_DIR to the current repository. If you want to
# clone from a non-local repository, set this to the URL of the repository,
Expand Down