Skip to content

Deploy combined with GCP, macOS, Terraform #34

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

Merged
merged 2 commits into from
Dec 27, 2019
+35 −26
Merged

Deploy combined with GCP, macOS, Terraform #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebfe71d
Deploy combined with GCP, macOS, Terraform
ody Dec 16, 2019
491ee6a
Rename target_host function to target_name
reidmv Dec 27, 2019
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
8 changes: 4 additions & 4 deletions functions/target_host.pp → functions/target_name.pp
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
function peadm::target_host(
function peadm::target_name(
Variant[Target, Array[Target,0,1]] $target,
) >> Variant[String, Undef] {
case $target {
Target: {
$target.host
$target.name
}
Array[Target,1,1]: {
$target[0].host
$target[0].name
}
Array[Target,0,0]: {
undef
}
default: {
fail('Unexpected input type to peadm::target_host function')
fail('Unexpected input type to peadm::target_name function')
}
}
}
20 changes: 10 additions & 10 deletions plans/unit/configure.pp
View file
Original file line number Diff line number Diff line change
@@ -46,10 +46,10 @@
# commented-out values should be used once GH-1244 is resolved.

# WORKAROUND: GH-1244
$master_host_string = $master_target.peadm::target_host()
$master_replica_host_string = $master_replica_target.peadm::target_host()
$puppetdb_database_host_string = $puppetdb_database_target.peadm::target_host()
$puppetdb_database_replica_host_string = $puppetdb_database_replica_target.peadm::target_host()
$master_host_string = $master_target.peadm::target_name()
$master_replica_host_string = $master_replica_target.peadm::target_name()
$puppetdb_database_host_string = $puppetdb_database_target.peadm::target_name()
$puppetdb_database_replica_host_string = $puppetdb_database_replica_target.peadm::target_name()

apply($master_target) {
# Necessary to give the sandboxed Puppet executor the configuration
@@ -65,10 +65,10 @@

class { 'peadm::setup::node_manager':
# WORKAROUND: GH-1244
master_host => $master_host_string, # $master_target.peadm::target_host(),
master_replica_host => $master_replica_host_string, # $master_replica_target.peadm::target_host(),
puppetdb_database_host => $puppetdb_database_host_string, # $puppetdb_database_target.peadm::target_host(),
puppetdb_database_replica_host => $puppetdb_database_replica_host_string, # $puppetdb_database_replica_target.peadm::target_host(),
master_host => $master_host_string, # $master_target.peadm::target_name(),
master_replica_host => $master_replica_host_string, # $master_replica_target.peadm::target_name(),
puppetdb_database_host => $puppetdb_database_host_string, # $puppetdb_database_target.peadm::target_name(),
puppetdb_database_replica_host => $puppetdb_database_replica_host_string, # $puppetdb_database_replica_target.peadm::target_name(),
compiler_pool_address => $compiler_pool_address,
require => File['node_manager.yaml'],
}
@@ -100,13 +100,13 @@
if $arch['high-availability'] {
# Run the PE Replica Provision
run_task('peadm::provision_replica', $master_target,
master_replica => $master_replica_target.peadm::target_host(),
master_replica => $master_replica_target.peadm::target_name(),
token_file => $token_file,
)

# Run the PE Replica Enable
run_task('peadm::enable_replica', $master_target,
master_replica => $master_replica_target.peadm::target_host(),
master_replica => $master_replica_target.peadm::target_name(),
token_file => $token_file,
)
}
22 changes: 11 additions & 11 deletions plans/unit/install.pp
View file
Original file line number Diff line number Diff line change
@@ -117,24 +117,24 @@
# Generate all the needed pe.conf files
$master_pe_conf = peadm::generate_pe_conf({
'console_admin_password' => $console_password,
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_host(),
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),
'pe_install::puppet_master_dnsaltnames' => $dns_alt_names,
'puppet_enterprise::profile::puppetdb::database_host' => $puppetdb_database_target.peadm::target_host(),
'puppet_enterprise::profile::puppetdb::database_host' => $puppetdb_database_target.peadm::target_name(),
'puppet_enterprise::profile::master::code_manager_auto_configure' => true,
'puppet_enterprise::profile::master::r10k_private_key' => '/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa',
'puppet_enterprise::profile::master::r10k_remote' => $r10k_remote,
} + $pe_conf_data)

$puppetdb_database_pe_conf = peadm::generate_pe_conf({
'console_admin_password' => 'not used',
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_host(),
'puppet_enterprise::database_host' => $puppetdb_database_target.peadm::target_host(),
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),
'puppet_enterprise::database_host' => $puppetdb_database_target.peadm::target_name(),
} + $pe_conf_data)

$puppetdb_database_replica_pe_conf = peadm::generate_pe_conf({
'console_admin_password' => 'not used',
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_host(),
'puppet_enterprise::database_host' => $puppetdb_database_replica_target.peadm::target_host(),
'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),
'puppet_enterprise::database_host' => $puppetdb_database_replica_target.peadm::target_name(),
} + $pe_conf_data)

# Upload the pe.conf files to the hosts that need them
@@ -210,7 +210,7 @@
}
# Configure autosigning for the puppetdb database hosts 'cause they need it
$autosign_conf = $database_targets.reduce('') |$memo,$target| { "${target.host}\n${memo}" }
$autosign_conf = $database_targets.reduce('') |$memo,$target| { "${target.name}\n${memo}" }
run_task('peadm::mkdir_p_file', $master_target,
path => '/etc/puppetlabs/puppet/autosign.conf',
owner => 'pe-puppet',
@@ -253,7 +253,7 @@

# Deploy the PE agent to all remaining hosts
run_task('peadm::agent_install', $master_replica_target,
server => $master_target.peadm::target_host(),
server => $master_target.peadm::target_name(),
install_flags => [
'--puppet-service-ensure', 'stopped',
"main:dns_alt_names=${dns_alt_names_csv}",
@@ -263,7 +263,7 @@
)

run_task('peadm::agent_install', $compiler_a_targets,
server => $master_target.peadm::target_host(),
server => $master_target.peadm::target_name(),
install_flags => [
'--puppet-service-ensure', 'stopped',
"main:dns_alt_names=${dns_alt_names_csv}",
@@ -273,7 +273,7 @@
)

run_task('peadm::agent_install', $compiler_b_targets,
server => $master_target.peadm::target_host(),
server => $master_target.peadm::target_name(),
install_flags => [
'--puppet-service-ensure', 'stopped',
"main:dns_alt_names=${dns_alt_names_csv}",
@@ -295,7 +295,7 @@
if !empty($agent_installer_targets) {
run_command(inline_epp(@(HEREDOC/L)), $master_target)
/opt/puppetlabs/bin/puppetserver ca sign --certname \
<%= $agent_installer_targets.map |$target| { $target.host }.join(',') -%>
<%= $agent_installer_targets.map |$target| { $target.name }.join(',') -%>
| HEREDOC
}

11 changes: 10 additions & 1 deletion tasks/filesize.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
#!/bin/bash

size=$(stat -c%s "$PT_path" 2>/dev/null || echo null)
case $(uname) in
Darwin)
options="-f%z"
;;
*)
options="-c%s"
;;
esac

size=$(stat "$options" "$PT_path" 2>/dev/null || echo null)

# Output a JSON result for ease of Task usage in Puppet Task Plans
if [ "$size" = "null" ]; then