Skip to content

Commit fc00709

Browse files
Allow code manager auto configure to be passed as param (#341)
* Allow code manager auto configure to be passed as param Basically we need the ability to turn off code manager for our CI, as it uninstalls the modules litmus puts in for acceptance testing. default behaviour left the same, just a new parameter exposed also we are correcting the unit testing
1 parent 501aa36 commit fc00709

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

plans/install.pp

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
Optional[Peadm::Ldap_config] $ldap_config = undef,
5050

5151
# Code Manager
52+
Optional[Boolean] $code_manager_auto_configure = true,
5253
Optional[String] $r10k_remote = undef,
5354
Optional[String] $r10k_private_key_file = undef,
5455
Optional[Peadm::Pem] $r10k_private_key_content = undef,
@@ -89,6 +90,7 @@
8990
pe_conf_data => $pe_conf_data,
9091

9192
# Code Manager
93+
code_manager_auto_configure => $code_manager_auto_configure,
9294
r10k_remote => $r10k_remote,
9395
r10k_private_key_file => $r10k_private_key_file,
9496
r10k_private_key_content => $r10k_private_key_content,

plans/subplans/install.pp

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
Hash $pe_conf_data = {},
4747

4848
# Code Manager
49+
Optional[Boolean] $code_manager_auto_configure = true,
4950
Optional[String] $r10k_remote = undef,
5051
Optional[String] $r10k_private_key_file = undef,
5152
Optional[Peadm::Pem] $r10k_private_key_content = undef,
@@ -163,7 +164,7 @@
163164
'puppet_enterprise::puppet_master_host' => $primary_target.peadm::certname(),
164165
'pe_install::puppet_master_dnsaltnames' => $dns_alt_names,
165166
'puppet_enterprise::puppetdb_database_host' => $primary_postgresql_target.peadm::certname(),
166-
'puppet_enterprise::profile::master::code_manager_auto_configure' => true,
167+
'puppet_enterprise::profile::master::code_manager_auto_configure' => $code_manager_auto_configure,
167168
'puppet_enterprise::profile::master::r10k_remote' => $r10k_remote,
168169
'puppet_enterprise::profile::master::r10k_private_key' => $r10k_private_key ? {
169170
undef => undef,

spec/acceptance/peadm_spec/plans/install_test_cluster.pp

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plan peadm_spec::install_test_cluster (
22
String[1] $architecture,
33
String $download_mode = 'direct',
4+
Optional[Boolean] $code_manager_auto_configure = undef,
45
Optional[String[1]] $version = undef,
56
Optional[String[1]] $pe_installer_source = undef,
67
Boolean $permit_unsafe_versions = false,
@@ -26,6 +27,7 @@
2627
$common_params = {
2728
console_password => 'puppetlabs',
2829
download_mode => $download_mode,
30+
code_manager_auto_configure => $code_manager_auto_configure,
2931
version => $version,
3032
pe_installer_source => $pe_installer_source,
3133
permit_unsafe_versions => $permit_unsafe_versions,

0 commit comments

Comments
 (0)